#12 Fix conflict of Integration tests

oehf · Sep 27, 2024 · a9d3a12 · a9d3a12
1 parent 6a9dd82
commit a9d3a12
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/test/java/org/openehealth/app/xdstofhir/registry/XdsToFhirApplicationIT.java b/src/test/java/org/openehealth/app/xdstofhir/registry/XdsToFhirApplicationIT.java
@@ -39,8 +39,10 @@
 import org.openehealth.ipf.commons.ihe.xds.core.responses.Response;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.test.annotation.DirtiesContext;
 
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
+@DirtiesContext
 class XdsToFhirApplicationIT {
 
     @Produce("xds-iti18://localhost:{{local.server.port}}/services/registry/iti18")

diff --git a/...est/java/org/openehealth/app/xdstofhir/registry/XdsToFhirApplicationWebServiceTestIT.java b/...est/java/org/openehealth/app/xdstofhir/registry/XdsToFhirApplicationWebServiceTestIT.java
@@ -11,7 +11,7 @@
 import org.springframework.boot.test.system.CapturedOutput;
 import org.springframework.boot.test.system.OutputCaptureExtension;
 import org.springframework.boot.test.web.server.LocalServerPort;
-import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.annotation.DirtiesContext;
 
 import javax.xml.namespace.QName;
 import javax.xml.transform.Source;
@@ -27,9 +27,11 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.springframework.test.util.AssertionErrors.assertEquals;
 
-@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
-@TestPropertySource(properties = {"xds.xua.enabled=true"})
+@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT,  properties = {
+	    "xds.xua.enabled=true"
+	  })
 @ExtendWith(OutputCaptureExtension.class)
+@DirtiesContext
 class XdsToFhirApplicationWebServiceTestIT {
     @LocalServerPort
     private int port;