Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • osl/code/org.etsi.osl.tmf.api
1 result
Show changes
Commits on Source (2)
...@@ -83,6 +83,7 @@ import org.junit.Before; ...@@ -83,6 +83,7 @@ import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; 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.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
...@@ -103,7 +104,7 @@ import net.minidev.json.JSONObject; ...@@ -103,7 +104,7 @@ import net.minidev.json.JSONObject;
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@Transactional @Transactional
@SpringBootTest( webEnvironment = SpringBootTest.WebEnvironment.MOCK , classes = OpenAPISpringBoot.class) @SpringBootTest( webEnvironment = SpringBootTest.WebEnvironment.MOCK , classes = OpenAPISpringBoot.class)
//@AutoConfigureTestDatabase //this automatically uses h2 @AutoConfigureTestDatabase //this automatically uses h2
@AutoConfigureMockMvc @AutoConfigureMockMvc
@ActiveProfiles("testing") @ActiveProfiles("testing")
//@TestPropertySource( //@TestPropertySource(
...@@ -114,7 +115,7 @@ public class ServiceCatalogIntegrationTest { ...@@ -114,7 +115,7 @@ public class ServiceCatalogIntegrationTest {
private static final transient Log logger = LogFactory.getLog( ServiceCatalogIntegrationTest.class.getName()); 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 = 1;
@Autowired @Autowired
private MockMvc mvc; private MockMvc mvc;
......
...@@ -28,6 +28,7 @@ import org.junit.Before; ...@@ -28,6 +28,7 @@ import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; 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.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
...@@ -47,6 +48,7 @@ import org.springframework.web.context.WebApplicationContext; ...@@ -47,6 +48,7 @@ import org.springframework.web.context.WebApplicationContext;
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@Transactional @Transactional
@SpringBootTest( webEnvironment = SpringBootTest.WebEnvironment.MOCK , classes = OpenAPISpringBoot.class) @SpringBootTest( webEnvironment = SpringBootTest.WebEnvironment.MOCK , classes = OpenAPISpringBoot.class)
@AutoConfigureTestDatabase //this automatically uses h2
@AutoConfigureMockMvc @AutoConfigureMockMvc
@ActiveProfiles("testing") @ActiveProfiles("testing")
public class ServiceSpecificationApiControllerTest { public class ServiceSpecificationApiControllerTest {
......