Commit 782556b5 authored by Nikolaos Kyriakoulis's avatar Nikolaos Kyriakoulis
Browse files

Fixed number of expected bootstrap items that caused tests to fail in... 

Fixed number of expected bootstrap items that caused tests to fail in ServiceSpecificationApiControllerTest and ServiceCatalogIntegrationTest
parent 7a4c6636

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

+7 −5
Original line number Diff line number Diff line
@@ -113,7 +113,9 @@ public class ServiceCatalogIntegrationTest { 


	private static final transient Log logger = LogFactory.getLog( ServiceCatalogIntegrationTest.class.getName());



	private static final int FIXED_BOOTSTRAPS_SPECS = 1;

	private static final int FIXED_BOOTSTRAPS_SPECS = 3;



	private static final int FIXED_BOOTSTRAPS_REFS = 1;



    @Autowired

    private MockMvc mvc;
@@ -161,10 +163,10 @@ public class ServiceCatalogIntegrationTest { 
		assertThat( categRepoService.findByName( "Generic Services" )  ).isNotNull() ;

		

		ServiceCategory categ = categRepoService.findByName( "Generic Services" );

		assertThat( categ.getServiceCandidateRefs().size() ).isEqualTo( FIXED_BOOTSTRAPS_SPECS );

		assertThat( categ.getServiceCandidateRefs().size() ).isEqualTo( FIXED_BOOTSTRAPS_REFS );

		

		ServiceCategory categ2 = categRepoService.findByIdEager( categ.getId() );

		assertThat( categ2.getServiceCandidateRefs().size() ).isEqualTo( FIXED_BOOTSTRAPS_SPECS );

		assertThat( categ2.getServiceCandidateRefs().size() ).isEqualTo( FIXED_BOOTSTRAPS_REFS );

		

		boolean vinnisbFound = false;

		boolean gstFound = false;
@@ -1013,7 +1015,7 @@ public class ServiceCatalogIntegrationTest { 
		

		ServiceCategory categ = categRepoService.findByName( "Generic Services" );

		ServiceCategory categ2 = categRepoService.findByIdEager( categ.getId() );

		assertThat( categ2.getServiceCandidateRefs().size() ).isEqualTo( FIXED_BOOTSTRAPS_SPECS );

		assertThat( categ2.getServiceCandidateRefs().size() ).isEqualTo( FIXED_BOOTSTRAPS_REFS );

		

		ServiceSpecification spec = this.specRepoService.findByNameAndVersion("A GST(NEST) Service Example", "5.0.0" );

		assertThat( spec ).isNotNull();

src/test/java/org/etsi/osl/services/api/scm633/ServiceSpecificationApiControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ import org.springframework.web.context.WebApplicationContext; 
@ActiveProfiles("testing")

public class ServiceSpecificationApiControllerTest {



    private static final int FIXED_BOOTSTRAPS_SPECS = 1;

    private static final int FIXED_BOOTSTRAPS_SPECS = 3;



    @Autowired

    private MockMvc mvc;