eclipse-edc · paullatzelsperger · Jul 28, 2022 · Jul 26, 2022
diff --git a/...clipse/dataspaceconnector/api/datamanagement/asset/AssetApiControllerIntegrationTest.java b/...clipse/dataspaceconnector/api/datamanagement/asset/AssetApiControllerIntegrationTest.java
@@ -52,6 +52,8 @@ public class AssetApiControllerIntegrationTest {
     @BeforeEach
     void setUp(EdcExtension extension) {
         extension.setConfiguration(Map.of(
+                "web.http.port", String.valueOf(getFreePort()),
+                "web.http.path", "/api",
                 "web.http.data.port", String.valueOf(port),
                 "web.http.data.path", "/api/v1/data",
                 "edc.api.auth.key", authKey

diff --git a/...g/eclipse/dataspaceconnector/api/datamanagement/asset/service/AssetEventDispatchTest.java b/...g/eclipse/dataspaceconnector/api/datamanagement/asset/service/AssetEventDispatchTest.java
@@ -22,13 +22,16 @@
 import org.eclipse.dataspaceconnector.spi.event.asset.AssetDeleted;
 import org.eclipse.dataspaceconnector.spi.types.domain.DataAddress;
 import org.eclipse.dataspaceconnector.spi.types.domain.asset.Asset;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
+import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.dataspaceconnector.junit.testfixtures.TestUtils.getFreePort;
 import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
@@ -39,6 +42,14 @@ public class AssetEventDispatchTest {
 
     private final EventSubscriber eventSubscriber = mock(EventSubscriber.class);
 
+    @BeforeEach
+    void setUp(EdcExtension extension) {
+        extension.setConfiguration(Map.of(
+                "web.http.port", String.valueOf(getFreePort()),
+                "web.http.path", "/api"
+        ));
+    }
+
     @Test
     void shouldDispatchEventsOnAssetCreationAndDeletion(AssetService service, EventRouter eventRouter) throws InterruptedException {
         var createdLatch = onDispatchLatch(AssetCreated.class);

diff --git a/...se/dataspaceconnector/api/datamanagement/catalog/CatalogApiControllerIntegrationTest.java b/...se/dataspaceconnector/api/datamanagement/catalog/CatalogApiControllerIntegrationTest.java
@@ -59,6 +59,8 @@ void setUp(EdcExtension extension) {
 
         extension.registerSystemExtension(ServiceExtension.class, new TestExtension());
         extension.setConfiguration(Map.of(
+                "web.http.port", String.valueOf(getFreePort()),
+                "web.http.path", "/api",
                 "web.http.data.port", String.valueOf(port),
                 "web.http.data.path", "/api/v1/data",
                 "edc.api.auth.key", authKey

diff --git a/...r/api/datamanagement/contractagreement/ContractAgreementApiControllerIntegrationTest.java b/...r/api/datamanagement/contractagreement/ContractAgreementApiControllerIntegrationTest.java
@@ -43,6 +43,8 @@ public class ContractAgreementApiControllerIntegrationTest {
     @BeforeEach
     void setUp(EdcExtension extension) {
         extension.setConfiguration(Map.of(
+                "web.http.port", String.valueOf(getFreePort()),
+                "web.http.path", "/api",
                 "web.http.data.port", String.valueOf(port),
                 "web.http.data.path", "/api/v1/data",
                 "edc.api.auth.key", authKey

diff --git a/...api/datamanagement/contractdefinition/ContractDefinitionApiControllerIntegrationTest.java b/...api/datamanagement/contractdefinition/ContractDefinitionApiControllerIntegrationTest.java
@@ -45,6 +45,8 @@ public class ContractDefinitionApiControllerIntegrationTest {
     @BeforeEach
     void setUp(EdcExtension extension) {
         extension.setConfiguration(Map.of(
+                "web.http.port", String.valueOf(getFreePort()),
+                "web.http.path", "/api",
                 "web.http.data.port", String.valueOf(port),
                 "web.http.data.path", "/api/v1/data",
                 "edc.api.auth.key", authKey

diff --git a/...or/api/datamanagement/contractdefinition/service/ContractDefinitionEventDispatchTest.java b/...or/api/datamanagement/contractdefinition/service/ContractDefinitionEventDispatchTest.java
@@ -21,12 +21,15 @@
 import org.eclipse.dataspaceconnector.spi.event.contractdefinition.ContractDefinitionCreated;
 import org.eclipse.dataspaceconnector.spi.event.contractdefinition.ContractDefinitionDeleted;
 import org.eclipse.dataspaceconnector.spi.types.domain.contract.offer.ContractDefinition;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
+import java.util.Map;
 import java.util.UUID;
 
 import static org.awaitility.Awaitility.await;
+import static org.eclipse.dataspaceconnector.junit.testfixtures.TestUtils.getFreePort;
 import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -36,6 +39,14 @@ public class ContractDefinitionEventDispatchTest {
 
     private final EventSubscriber eventSubscriber = mock(EventSubscriber.class);
 
+    @BeforeEach
+    void setUp(EdcExtension extension) {
+        extension.setConfiguration(Map.of(
+                "web.http.port", String.valueOf(getFreePort()),
+                "web.http.path", "/api"
+        ));
+    }
+
     @Test
     void shouldDispatchEventOnContractDefinitionCreationAndDeletion(ContractDefinitionService service, EventRouter eventRouter) {
         eventRouter.register(eventSubscriber);

diff --git a/...i/datamanagement/contractnegotiation/ContractNegotiationApiControllerIntegrationTest.java b/...i/datamanagement/contractnegotiation/ContractNegotiationApiControllerIntegrationTest.java
@@ -51,6 +51,8 @@ class ContractNegotiationApiControllerIntegrationTest {
     @BeforeEach
     void setUp(EdcExtension extension) {
         extension.setConfiguration(Map.of(
+                "web.http.port", String.valueOf(getFreePort()),
+                "web.http.path", "/api",
                 "web.http.data.port", String.valueOf(port),
                 "web.http.data.path", "/api/v1/data",
                 "edc.api.auth.key", authKey

diff --git a/.../api/datamanagement/contractnegotiation/service/ContractNegotiationEventDispatchTest.java b/.../api/datamanagement/contractnegotiation/service/ContractNegotiationEventDispatchTest.java
@@ -53,6 +53,7 @@
 import java.util.concurrent.CompletableFuture;
 
 import static org.awaitility.Awaitility.await;
+import static org.eclipse.dataspaceconnector.junit.testfixtures.TestUtils.getFreePort;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.mock;
@@ -68,6 +69,8 @@ public class ContractNegotiationEventDispatchTest {
     @BeforeEach
     void setUp(EdcExtension extension) {
         extension.setConfiguration(Map.of(
+                "web.http.port", String.valueOf(getFreePort()),
+                "web.http.path", "/api",
                 "edc.negotiation.consumer.send.retry.limit", "0",
                 "edc.negotiation.provider.send.retry.limit", "0"
         ));

diff --git a/...paceconnector/api/datamanagement/policy/PolicyDefinitionApiControllerIntegrationTest.java b/...paceconnector/api/datamanagement/policy/PolicyDefinitionApiControllerIntegrationTest.java
@@ -43,6 +43,8 @@ public class PolicyDefinitionApiControllerIntegrationTest {
     @BeforeEach
     void setUp(EdcExtension extension) {
         extension.setConfiguration(Map.of(
+                "web.http.port", String.valueOf(getFreePort()),
+                "web.http.path", "/api",
                 "web.http.data.port", String.valueOf(port),
                 "web.http.data.path", "/api/v1/data",
                 "edc.api.auth.key", authKey

diff --git a/...taspaceconnector/api/datamanagement/policy/service/PolicyDefinitionEventDispatchTest.java b/...taspaceconnector/api/datamanagement/policy/service/PolicyDefinitionEventDispatchTest.java
@@ -22,13 +22,16 @@
 import org.eclipse.dataspaceconnector.spi.event.EventSubscriber;
 import org.eclipse.dataspaceconnector.spi.event.policydefinition.PolicyDefinitionCreated;
 import org.eclipse.dataspaceconnector.spi.event.policydefinition.PolicyDefinitionDeleted;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
+import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.dataspaceconnector.junit.testfixtures.TestUtils.getFreePort;
 import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
@@ -39,6 +42,14 @@ public class PolicyDefinitionEventDispatchTest {
 
     private final EventSubscriber eventSubscriber = mock(EventSubscriber.class);
 
+    @BeforeEach
+    void setUp(EdcExtension extension) {
+        extension.setConfiguration(Map.of(
+                "web.http.port", String.valueOf(getFreePort()),
+                "web.http.path", "/api"
+        ));
+    }
+
     @Test
     void shouldDispatchEventOnPolicyDefinitionCreationAndDeletion(PolicyDefinitionService service, EventRouter eventRouter) throws InterruptedException {
         var createdLatch = onDispatchLatch(PolicyDefinitionCreated.class);

diff --git a/...ector/api/datamanagement/transferprocess/TransferProcessApiControllerIntegrationTest.java b/...ector/api/datamanagement/transferprocess/TransferProcessApiControllerIntegrationTest.java
@@ -47,6 +47,8 @@ class TransferProcessApiControllerIntegrationTest {
     @BeforeEach
     void setUp(EdcExtension extension) {
         extension.setConfiguration(Map.of(
+                "web.http.port", String.valueOf(getFreePort()),
+                "web.http.path", "/api",
                 "web.http.data.port", String.valueOf(port),
                 "web.http.data.path", "/api/v1/data",
                 "edc.api.auth.key", authKey

diff --git a/...onnector/api/datamanagement/transferprocess/service/TransferProcessEventDispatchTest.java b/...onnector/api/datamanagement/transferprocess/service/TransferProcessEventDispatchTest.java
@@ -40,6 +40,7 @@
 import java.util.concurrent.Executors;
 
 import static org.awaitility.Awaitility.await;
+import static org.eclipse.dataspaceconnector.junit.testfixtures.TestUtils.getFreePort;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.mock;
@@ -54,10 +55,12 @@ public class TransferProcessEventDispatchTest {
     @BeforeEach
     void setUp(EdcExtension extension) {
         extension.setConfiguration(Map.of("edc.transfer.send.retry.limit", "0",
-                                          "edc.transfer.send.retry.base-delay.ms", "0"));
+                "edc.transfer.send.retry.base-delay.ms", "0",
+                "web.http.port", String.valueOf(getFreePort()),
+                "web.http.path", "/api"));
         extension.registerServiceMock(TransferWaitStrategy.class, () -> 1);
         extension.registerServiceMock(EventExecutorServiceContainer.class,
-                                      new EventExecutorServiceContainer(Executors.newSingleThreadExecutor()));
+                new EventExecutorServiceContainer(Executors.newSingleThreadExecutor()));
     }
 
     @Test

diff --git a/...dataspaceconnector/transfer/provision/http/impl/HttpProvisionerExtensionEndToEndTest.java b/...dataspaceconnector/transfer/provision/http/impl/HttpProvisionerExtensionEndToEndTest.java
@@ -101,6 +101,8 @@ void processProviderRequestRetry(TransferProcessManager processManager,
     @BeforeEach
     void setup(EdcExtension extension) {
         extension.setConfiguration(Map.of(
+                "web.http.port", String.valueOf(getFreePort()),
+                "web.http.path", "/api",
                 "web.http.data.port", String.valueOf(dataPort),
                 "web.http.data.path", "/api/v1/data"
         ));

diff --git a/...r/transfer/provision/http/webhook/HttpProvisionerWebhookApiControllerIntegrationTest.java b/...r/transfer/provision/http/webhook/HttpProvisionerWebhookApiControllerIntegrationTest.java
@@ -49,6 +49,8 @@ class HttpProvisionerWebhookApiControllerIntegrationTest {
     @BeforeEach
     void setUp(EdcExtension extension) {
         extension.setConfiguration(Map.of(
+                "web.http.port", String.valueOf(getFreePort()),
+                "web.http.path", "/api",
                 "web.http.provisioner.port", String.valueOf(port),
                 "web.http.provisioner.path", PROVISIONER_BASE_PATH,
                 "edc.api.auth.key", authKey

diff --git a/...g/eclipse/dataspaceconnector/extension/jersey/mapper/ExceptionMappersIntegrationTest.java b/...g/eclipse/dataspaceconnector/extension/jersey/mapper/ExceptionMappersIntegrationTest.java
@@ -56,6 +56,7 @@ public class ExceptionMappersIntegrationTest {
     void setUp(EdcExtension extension) {
         extension.setConfiguration(Map.of(
                 "web.http.port", String.valueOf(getFreePort()),
+                "web.http.path", "/api",
                 "web.http.test.port", String.valueOf(port),
                 "web.http.test.path", "/"
         ));
@@ -115,6 +116,16 @@ void shouldReturn500ErrorOnJavaLangExceptions() {
                 .statusCode(500);
     }
 
+    private static class RequestPayload {
+        @NotBlank
+        @JsonProperty
+        private String data;
+
+        @Positive
+        @JsonProperty
+        private long number;
+    }
+
     @Path("/test")
     public class TestController {
 
@@ -132,16 +143,6 @@ public void doAction(@Valid RequestPayload payload) {
 
     }
 
-    private static class RequestPayload {
-        @NotBlank
-        @JsonProperty
-        private String data;
-
-        @Positive
-        @JsonProperty
-        private long number;
-    }
-
     private class MyServiceExtension implements ServiceExtension {
         @Inject
         private WebService webService;

diff --git a/...ions/junit/src/main/java/org/eclipse/dataspaceconnector/junit/testfixtures/TestUtils.java b/...ions/junit/src/main/java/org/eclipse/dataspaceconnector/junit/testfixtures/TestUtils.java
@@ -33,9 +33,10 @@
 public class TestUtils {
     public static final int MAX_TCP_PORT = 65_535;
     public static final String GRADLE_WRAPPER;
-    private static File buildRoot = null;
     private static final String GRADLE_WRAPPER_UNIX = "gradlew";
     private static final String GRADLE_WRAPPER_WINDOWS = "gradlew.bat";
+    private static final Random RANDOM = new Random();
+    private static File buildRoot = null;
 
     static {
         GRADLE_WRAPPER = (System.getProperty("os.name").toLowerCase().contains("win")) ? GRADLE_WRAPPER_WINDOWS : GRADLE_WRAPPER_UNIX;
@@ -65,7 +66,7 @@ public static String getResourceFileContentAsString(String resourceName) {
      * @throws IllegalArgumentException if no free port is available
      */
     public static int getFreePort() {
-        var rnd = 1024 + new Random().nextInt(MAX_TCP_PORT - 1024);
+        var rnd = 1024 + RANDOM.nextInt(MAX_TCP_PORT - 1024);
         return getFreePort(rnd);
     }
 
@@ -152,7 +153,9 @@ public static OkHttpClient testOkHttpClient() {
      */
     public static File findBuildRoot() {
         // Use cached value if already existing.
-        if (buildRoot != null) return buildRoot;
+        if (buildRoot != null) {
+            return buildRoot;
+        }
 
         File canonicalFile;
         try {