Commit 43823766 authored by George Tziavas's avatar George Tziavas
Browse files

Added @AutoConfigureTestDatabase to isolate each test suite's bootstrapped resources

parent eada418f

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

+0 −1
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ public class ResourceOrderIntegrationTest { 
				.post("/resourceOrderingManagement/v4/resourceOrder")

				.with(SecurityMockMvcRequestPostProcessors.csrf()).contentType(MediaType.APPLICATION_JSON)

				.content(JsonUtils.toJson( resorder )))

				.andExpect(status().isOk())

				.andExpect(content().contentTypeCompatibleWith(MediaType.APPLICATION_JSON))

				.andExpect(status().isOk())

				.andReturn()

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

+3 −1
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ import org.junit.Before; 
import org.junit.Test;

import org.junit.runner.RunWith;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;

import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;

import org.springframework.boot.test.context.SpringBootTest;

import org.springframework.http.MediaType;
@@ -103,7 +104,7 @@ import net.minidev.json.JSONObject; 
@RunWith(SpringRunner.class)

@Transactional

@SpringBootTest( webEnvironment = SpringBootTest.WebEnvironment.MOCK , classes = OpenAPISpringBoot.class)

//@AutoConfigureTestDatabase //this automatically uses h2

@AutoConfigureTestDatabase //this automatically uses h2

@AutoConfigureMockMvc 

@ActiveProfiles("testing")

//@TestPropertySource(
@@ -965,6 +966,7 @@ public class ServiceCatalogIntegrationTest { 
		}

		

		assertThat(userPartyRoleOwnerexists  ).isTrue() ;

		List<ServiceSpecification> allSpecs = specRepoService.findAll();

		assertThat( specRepoService.findAll().size() ).isEqualTo( FIXED_BOOTSTRAPS_SPECS +1 );

		assertThat( specRepoService.findAll( null, new HashMap<>()).size() ).isEqualTo( FIXED_BOOTSTRAPS_SPECS ); //this is somehow wrong in Testing ONLY

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

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import org.junit.Before; 
import org.junit.Test;

import org.junit.runner.RunWith;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;

import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;

import org.springframework.boot.test.context.SpringBootTest;

import org.springframework.http.HttpHeaders;
@@ -48,6 +49,7 @@ import org.springframework.web.context.WebApplicationContext; 
@Transactional

@SpringBootTest( webEnvironment = SpringBootTest.WebEnvironment.MOCK , classes = OpenAPISpringBoot.class)

@AutoConfigureMockMvc

@AutoConfigureTestDatabase

@ActiveProfiles("testing")

public class ServiceSpecificationApiControllerTest {