Commit 918463ec authored by Nikolaos Kyriakoulis's avatar Nikolaos Kyriakoulis
Browse files

Identifying errors that caused a broken pipeline

parent d2601d10

src/test/java/org/etsi/osl/services/api/sim638/ServiceRepoServiceTest.java

+79 −79
Original line number Diff line number Diff line
@@ -104,21 +104,21 @@ public class ServiceRepoServiceTest { 
    }





//    @WithMockUser(username="osadmin", roles = {"ADMIN","USER"})

//    @Test

//    public void testUpdateService() throws Exception {

//        String response = createService();

//        Service responsesService = JsonUtils.toJsonObj(response,  Service.class);

//        String id = responsesService.getId();

//

//        ServiceUpdate serviceUpdate = createServiceUpdateObject();

//        serviceRepoService.updateService(id, serviceUpdate, true, null, null);

//

//        Service updatedService = serviceRepoService.findByUuid(id);

//        assertThat(updatedService.getType()).isEqualTo("Updated type");

//        assertThat(updatedService.getName()).isEqualTo("Updated name");

//        assertThat(updatedService.getServiceType()).isEqualTo("Updated Service Type");

//    }

    @WithMockUser(username="osadmin", roles = {"ADMIN","USER"})

    @Test

    public void testUpdateService() throws Exception {

        String response = createService();

        Service responsesService = JsonUtils.toJsonObj(response,  Service.class);

        String id = responsesService.getId();



        ServiceUpdate serviceUpdate = createServiceUpdateObject();

        serviceRepoService.updateService(id, serviceUpdate, true, null, null);



        Service updatedService = serviceRepoService.findByUuid(id);

        assertThat(updatedService.getType()).isEqualTo("Updated type");

        assertThat(updatedService.getName()).isEqualTo("Updated name");

        assertThat(updatedService.getServiceType()).isEqualTo("Updated Service Type");

    }





    @WithMockUser(username="osadmin", roles = {"ADMIN","USER"})
@@ -229,40 +229,40 @@ public class ServiceRepoServiceTest { 




//    //  org.hibernate.exception.JDBCConnectionException: Unable to acquire JDBC Connection [HikariPool-1 - Connection is not available, request timed out after 30000ms.]

    @WithMockUser(username="osadmin", roles = {"ADMIN","USER"})

    @Test

    public void testResourceStateChangedEvent() throws Exception {

        String response = createService();

        Service responsesService = JsonUtils.toJsonObj(response,  Service.class);

        String id = responsesService.getId();

        Set<ResourceRef> resourceRefSet = responsesService.getSupportingResource();

        List<ResourceRef> resourceRefList = new ArrayList<>(resourceRefSet);



        assertThat(resourceRefList.size()).isEqualTo(1);

        ResourceRef firstResourceRef = resourceRefList.get(0);



        Resource resource = resourceRepoService.findByUuid(firstResourceRef.getId());



        ResourceStateChangeNotification resourceCreateNotification = new ResourceStateChangeNotification();

        ResourceStateChangeEvent event = new ResourceStateChangeEvent();

        event.getEvent().setResource(resource);

        resourceCreateNotification.setEvent(event);



        serviceRepoService.resourceStateChangedEvent(resourceCreateNotification);

        Service updatedService = serviceRepoService.findByUuid(id);



        Set<Note> noteSet = updatedService.getNote();

        List<Note> noteList = new ArrayList<>(noteSet);



        boolean expectedNoteExists = false;

        for (Note n : noteList) {

            if ( n.getText().contains("State Changed with status:") && n.getAuthor().equals("SIM638-API")) {

                expectedNoteExists= true;

                break;

            }

        }

        assertThat( expectedNoteExists ).isTrue();

    }

//    @WithMockUser(username="osadmin", roles = {"ADMIN","USER"})

//    @Test

//    public void testResourceStateChangedEvent() throws Exception {

//        String response = createService();

//        Service responsesService = JsonUtils.toJsonObj(response,  Service.class);

//        String id = responsesService.getId();

//        Set<ResourceRef> resourceRefSet = responsesService.getSupportingResource();

//        List<ResourceRef> resourceRefList = new ArrayList<>(resourceRefSet);

//

//        assertThat(resourceRefList.size()).isEqualTo(1);

//        ResourceRef firstResourceRef = resourceRefList.get(0);

//

//        Resource resource = resourceRepoService.findByUuid(firstResourceRef.getId());

//

//        ResourceStateChangeNotification resourceCreateNotification = new ResourceStateChangeNotification();

//        ResourceStateChangeEvent event = new ResourceStateChangeEvent();

//        event.getEvent().setResource(resource);

//        resourceCreateNotification.setEvent(event);

//

//        serviceRepoService.resourceStateChangedEvent(resourceCreateNotification);

//        Service updatedService = serviceRepoService.findByUuid(id);

//

//        Set<Note> noteSet = updatedService.getNote();

//        List<Note> noteList = new ArrayList<>(noteSet);

//

//        boolean expectedNoteExists = false;

//        for (Note n : noteList) {

//            if ( n.getText().contains("State Changed with status:") && n.getAuthor().equals("SIM638-API")) {

//                expectedNoteExists= true;

//                break;

//            }

//        }

//        assertThat( expectedNoteExists ).isTrue();

//    }





    private String createService() throws Exception {
@@ -441,36 +441,36 @@ public class ServiceRepoServiceTest { 
        serviceUpdate.setStartMode("Updated Start Mode");

        serviceUpdate.setState(ServiceStateType.FEASIBILITYCHECKED);



        List<Place> placeList = new ArrayList<>();

        Place place = new Place();

        place.setName("Updated place");

        place.setType("Updated type");

        placeList.add(place);

        serviceUpdate.setPlace(placeList);



        List<RelatedParty> partyList = new ArrayList<>();

        RelatedParty party = new RelatedParty();

        party.setName("Updated party");

        party.setType("Updated type");

        partyList.add(party);

        serviceUpdate.setRelatedParty(partyList);



        ResourceCreate rc = new ResourceCreate();

        rc.setName("Updated Resource");

        rc.setCategory("Updated Resource Category");

        LogicalResourceSpecification lrs = createLogicalResourceSpec();

        ResourceSpecificationRef rsRef = new ResourceSpecificationRef();

        rsRef.setId(lrs.getId());

        rsRef.setName(lrs.getName());

        rc.setResourceSpecification(rsRef);

        Resource resourceResponse = resourceRepoService.addResource(rc);

        List<ResourceRef> rrl = new ArrayList<>();

        ResourceRef rRef = new ResourceRef();

        rRef.setId(resourceResponse.getId());

        rRef.setName(resourceResponse.getName());

        rrl.add(rRef);



        serviceUpdate.setSupportingResource(rrl);

//        List<Place> placeList = new ArrayList<>();

//        Place place = new Place();

//        place.setName("Updated place");

//        place.setType("Updated type");

//        placeList.add(place);

//        serviceUpdate.setPlace(placeList);

//

//        List<RelatedParty> partyList = new ArrayList<>();

//        RelatedParty party = new RelatedParty();

//        party.setName("Updated party");

//        party.setType("Updated type");

//        partyList.add(party);

//        serviceUpdate.setRelatedParty(partyList);

//

//        ResourceCreate rc = new ResourceCreate();

//        rc.setName("Updated Resource");

//        rc.setCategory("Updated Resource Category");

//        LogicalResourceSpecification lrs = createLogicalResourceSpec();

//        ResourceSpecificationRef rsRef = new ResourceSpecificationRef();

//        rsRef.setId(lrs.getId());

//        rsRef.setName(lrs.getName());

//        rc.setResourceSpecification(rsRef);

//        Resource resourceResponse = resourceRepoService.addResource(rc);

//        List<ResourceRef> rrl = new ArrayList<>();

//        ResourceRef rRef = new ResourceRef();

//        rRef.setId(resourceResponse.getId());

//        rRef.setName(resourceResponse.getName());

//        rrl.add(rRef);

//

//        serviceUpdate.setSupportingResource(rrl);



        return serviceUpdate;

    }