Commit 1c9da1be authored by Christos Tranoris's avatar Christos Tranoris
Browse files

merge develop and fix tests

parent 92cb462f

src/test/java/org/etsi/osl/services/api/ServiceInventoryIntegrationTest.java

+4 −4
Original line number Diff line number Diff line
@@ -155,18 +155,18 @@ public class ServiceInventoryIntegrationTest extends BaseIT { 
		Characteristic serviceCharacteristicItem = new Characteristic();

		

		serviceCharacteristicItem.setName( "ConfigStatus" );

		serviceCharacteristicItem.setValue( new Any("NONE"));

		serviceCharacteristicItem.setValue( new Any("0"));

		aService.addServiceCharacteristicItem(serviceCharacteristicItem);



		serviceCharacteristicItem = new Characteristic();		

		serviceCharacteristicItem.setName( "NSLCM" );

		serviceCharacteristicItem.setValue( new Any("nslcm_test"));

		serviceCharacteristicItem.setValue( new Any("0"));

		aService.addServiceCharacteristicItem(serviceCharacteristicItem);

		



		serviceCharacteristicItem = new Characteristic();		

		serviceCharacteristicItem.setName( "NSR" );

		serviceCharacteristicItem.setValue( new Any("nsr_test"));

		serviceCharacteristicItem.setValue( new Any("0"));

		aService.addServiceCharacteristicItem(serviceCharacteristicItem);

		

		ServiceSpecificationRef aServiceSpecificationRef = new ServiceSpecificationRef();
@@ -197,7 +197,7 @@ public class ServiceInventoryIntegrationTest extends BaseIT { 
		assertThat( responseSrvc.getStartDate() ).isNotNull();

		assertThat( responseSrvc.getEndDate() ).isNotNull();

		assertThat( responseSrvc.getServiceCharacteristic().size()  ).isEqualTo( 3 );

		assertThat( responseSrvc.getServiceCharacteristicByName( "ConfigStatus" ).getValue().getValue()  ).isEqualTo( "NONE" )  ;

		assertThat( responseSrvc.getServiceCharacteristicByName( "ConfigStatus" ).getValue().getValue()  ).isEqualTo( "0" )  ;

		



		assertThat( responseSrvc.getNote().size()  ).isEqualTo( 2 );

src/test/java/org/etsi/osl/services/api/metrics/ServiceMetricsApiControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ public class ServiceMetricsApiControllerTest extends BaseIT { 
        Characteristic serviceCharacteristicItem = new Characteristic();



        serviceCharacteristicItem.setName( "ConfigStatus" );

        serviceCharacteristicItem.setValue( new Any("NONE"));

        serviceCharacteristicItem.setValue( new Any("0"));

        aService.addServiceCharacteristicItem(serviceCharacteristicItem);



        ServiceSpecificationRef aServiceSpecificationRef = new ServiceSpecificationRef();

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

+7 −19
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ public class ServiceRepoServiceTest extends BaseIT { 
        assertThat( updatedService.getSupportingResource().size()  ).isEqualTo( 1);

        



        assertThat( updatedService.getServiceCharacteristicByName("NSLCM").getValue().getValue()   ).isEqualTo( "nslcm_test" );

        assertThat( updatedService.getServiceCharacteristicByName("NSLCM").getValue().getValue()   ).isEqualTo( "0" );



        ResourceUpdate resourceUpdate = new ResourceUpdate();
@@ -341,20 +341,8 @@ public class ServiceRepoServiceTest extends BaseIT { 
        

        updatedService = serviceRepoService.findByUuid(id);

        assertThat( updatedService.getSupportingResource().size()  ).isEqualTo( 1);

        assertThat( updatedService.getServiceCharacteristic().size()  ).isEqualTo( 8 );

        

        

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

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

        assertThat( updatedService.getServiceCharacteristic().size()  ).isEqualTo( 7 );

        

        boolean expectedNoteExists = false;

        for (Note n : noteList) {

            if ( n.getText().contains("Supporting Resource changed with") && n.getAuthor().equals("SIM638-API")) {

                expectedNoteExists= true;

                break;

            }

        }

        assertThat( expectedNoteExists ).isTrue();

    }
@@ -403,22 +391,22 @@ public class ServiceRepoServiceTest extends BaseIT { 
        Characteristic serviceCharacteristicItem = new Characteristic();



        serviceCharacteristicItem.setName( "ConfigStatus" );

        serviceCharacteristicItem.setValue( new Any("NONE"));

        serviceCharacteristicItem.setValue( new Any("0"));

        aService.addServiceCharacteristicItem(serviceCharacteristicItem);



        serviceCharacteristicItem = new Characteristic();

        serviceCharacteristicItem.setName( "NSLCM" );

        serviceCharacteristicItem.setValue( new Any("nslcm_test"));

        serviceCharacteristicItem.setValue( new Any("0"));

        aService.addServiceCharacteristicItem(serviceCharacteristicItem);



        serviceCharacteristicItem = new Characteristic();

        serviceCharacteristicItem.setName( "NSR" );

        serviceCharacteristicItem.setValue( new Any("nsr_test"));

        serviceCharacteristicItem.setValue( new Any("0"));

        aService.addServiceCharacteristicItem(serviceCharacteristicItem);



        serviceCharacteristicItem = new Characteristic();

        serviceCharacteristicItem.setName( "externalPartnerServiceId" );

        serviceCharacteristicItem.setValue( new Any("ext_test"));

        serviceCharacteristicItem.setValue( new Any("0"));

        aService.addServiceCharacteristicItem(serviceCharacteristicItem);



        serviceCharacteristicItem = new Characteristic();

src/test/java/org/etsi/osl/services/api/so641/ServiceOrderApiControllerTest.java

+20 −2
Original line number Diff line number Diff line
@@ -12,12 +12,14 @@ import java.io.InputStream; 
import java.time.OffsetDateTime;

import java.time.ZoneOffset;

import java.util.ArrayList;

import java.util.HashSet;

import java.util.List;

import java.util.Optional;

import java.util.Set;

import org.apache.commons.io.IOUtils;

import org.etsi.osl.services.api.BaseIT;

import org.etsi.osl.tmf.JsonUtils;

import org.etsi.osl.tmf.common.model.Any;

import org.etsi.osl.tmf.common.model.service.Place;

import org.etsi.osl.tmf.common.model.service.ServiceSpecificationRef;

import org.etsi.osl.tmf.pm632.model.ContactMedium;
@@ -26,6 +28,7 @@ import org.etsi.osl.tmf.pm632.model.IndividualCreate; 
import org.etsi.osl.tmf.pm632.model.MediumCharacteristic;

import org.etsi.osl.tmf.pm632.reposervices.IndividualRepoService;

import org.etsi.osl.tmf.prm669.model.RelatedParty;

import org.etsi.osl.tmf.scm633.model.ServiceSpecCharacteristicValue;

import org.etsi.osl.tmf.scm633.model.ServiceSpecification;

import org.etsi.osl.tmf.scm633.model.ServiceSpecificationCreate;

import org.etsi.osl.tmf.so641.model.ServiceOrder;
@@ -461,6 +464,14 @@ public class ServiceOrderApiControllerTest extends BaseIT { 
        org.etsi.osl.tmf.scm633.model.ServiceSpecCharacteristic configurableChar = new org.etsi.osl.tmf.scm633.model.ServiceSpecCharacteristic();

        configurableChar.setName("configurableChar");

        configurableChar.setConfigurable(true);

        configurableChar.setValueType("TEXT");

        Set<ServiceSpecCharacteristicValue> hset = new HashSet<>();

        ServiceSpecCharacteristicValue cspec = new ServiceSpecCharacteristicValue();

        cspec.setValue( new Any("xxx"));

        cspec.setValueType("TEXT");

        hset.add(cspec );

        configurableChar.setServiceSpecCharacteristicValue( hset );

        

        specCreate.addServiceSpecCharacteristicItem(configurableChar);

        ServiceSpecification createdSpec = createServiceSpec(specCreate);
@@ -484,7 +495,7 @@ public class ServiceOrderApiControllerTest extends BaseIT { 
        // Add configurable characteristic (allowed)

        org.etsi.osl.tmf.common.model.service.Characteristic chara = new org.etsi.osl.tmf.common.model.service.Characteristic();

        chara.setName("configurableChar");

        chara.setValue(new org.etsi.osl.tmf.common.model.Any("value1"));

        chara.setValue(new org.etsi.osl.tmf.common.model.Any("0"));

        serviceRestriction.addServiceCharacteristicItem(chara);



        soi.setService(serviceRestriction);
@@ -631,6 +642,13 @@ public class ServiceOrderApiControllerTest extends BaseIT { 
        org.etsi.osl.tmf.scm633.model.ServiceSpecCharacteristic configurableChar = new org.etsi.osl.tmf.scm633.model.ServiceSpecCharacteristic();

        configurableChar.setName("configurableChar");

        configurableChar.setConfigurable(true);

        configurableChar.setValueType("TEXT");

        Set<ServiceSpecCharacteristicValue> hset = new HashSet<>();

        ServiceSpecCharacteristicValue cspec = new ServiceSpecCharacteristicValue();

        cspec.setValue( new Any("xxx"));

        cspec.setValueType("TEXT");

        hset.add(cspec );

        configurableChar.setServiceSpecCharacteristicValue( hset );

        specCreate.addServiceSpecCharacteristicItem(configurableChar);



        org.etsi.osl.tmf.scm633.model.ServiceSpecCharacteristic nonConfigChar = new org.etsi.osl.tmf.scm633.model.ServiceSpecCharacteristic();
@@ -660,7 +678,7 @@ public class ServiceOrderApiControllerTest extends BaseIT { 
        // Add only configurable characteristic (allowed)

        org.etsi.osl.tmf.common.model.service.Characteristic chara = new org.etsi.osl.tmf.common.model.service.Characteristic();

        chara.setName("configurableChar");

        chara.setValue(new org.etsi.osl.tmf.common.model.Any("value1"));

        chara.setValue(new org.etsi.osl.tmf.common.model.Any("0"));

        serviceRestriction.addServiceCharacteristicItem(chara);



        soi.setService(serviceRestriction);

src/test/resources/testServiceSpec.json

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ 
          "unitOfMeasure": "N/A",

          "valueFrom": null,

          "valueTo": null,

          "valueType": "SMALLINT",

          "valueType": "TEXT",

          "validFor": null,

          "value": {

            "value": "0",