feat: split Junit module between base utils and the integration test …

…runtime (#4042)

Split Junit module between base utils and the integration test runtime

core/common/junit/build.gradle.kts

@@ -19,6 +19,8 @@ plugins {
 }
 
 dependencies {
+    api(project(":tests:junit-base"))
+
     api(project(":spi:common:core-spi"))
     api(project(":core:common:boot"))
     api(project(":core:common:util"))
@@ -36,7 +38,6 @@ dependencies {
     implementation(libs.testcontainers.junit)
     testImplementation(project(":core:common:connector-core"))
 
-
     testImplementation(project(":core:common:lib:boot-lib"))
 }
 

core/common/lib/http-lib/build.gradle.kts

@@ -26,6 +26,8 @@ dependencies {
 
     testImplementation(project(":core:common:util"))
 
+    testFixturesImplementation(libs.mockito.core)
+
     testImplementation(libs.mockserver.netty)
 }
 

core/common/lib/http-lib/src/testFixtures/java/org/eclipse/http/client/testfixtures/HttpTestUtils.java

@@ -0,0 +1,63 @@
+/*
+ *  Copyright (c) 2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation
+ *
+ */
+
+package org.eclipse.http.client.testfixtures;
+
+import dev.failsafe.RetryPolicy;
+import okhttp3.Interceptor;
+import okhttp3.OkHttpClient;
+import org.eclipse.edc.spi.http.EdcHttpClient;
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.http.client.EdcHttpClientImpl;
+import org.mockito.Mockito;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * HTTP-related test utilities.
+ */
+public class HttpTestUtils {
+
+    /**
+     * Create an {@link OkHttpClient} suitable for using in unit tests. The client configured with long timeouts
+     * suitable for high-contention scenarios in CI.
+     *
+     * @return an {@link OkHttpClient.Builder}.
+     */
+    public static OkHttpClient testOkHttpClient(Interceptor... interceptors) {
+        var builder = new OkHttpClient.Builder()
+                .connectTimeout(1, TimeUnit.MINUTES)
+                .writeTimeout(1, TimeUnit.MINUTES)
+                .readTimeout(1, TimeUnit.MINUTES);
+
+        for (Interceptor interceptor : interceptors) {
+            builder.addInterceptor(interceptor);
+        }
+
+        return builder.build();
+    }
+
+    /**
+     * Create an {@link org.eclipse.edc.spi.http.EdcHttpClient} suitable for using in unit tests. The client configured with long timeouts
+     * suitable for high-contention scenarios in CI.
+     *
+     * @return an {@link OkHttpClient.Builder}.
+     */
+    public static EdcHttpClient testHttpClient(Interceptor... interceptors) {
+        return new EdcHttpClientImpl(testOkHttpClient(interceptors), RetryPolicy.ofDefaults(), Mockito.mock(Monitor.class));
+    }
+
+    private HttpTestUtils() {
+    }
+}

core/common/lib/keys-lib/build.gradle.kts

@@ -25,7 +25,7 @@ dependencies {
     implementation(libs.nimbus.jwt)
     implementation(libs.tink)
 
-    testImplementation(project(":core:common:junit"));
+    testImplementation(project(":tests:junit-base"));
 
 }
 

core/common/policy-engine/build.gradle.kts

@@ -22,7 +22,7 @@ dependencies {
     api(project(":spi:common:policy-model"))
     implementation(project(":core:common:policy-evaluator"))
 
-    testImplementation(project(":core:common:junit"))
+    testImplementation(project(":tests:junit-base"));
 }
 
 

core/common/transform-core/build.gradle.kts

@@ -25,6 +25,6 @@ dependencies {
 
     api(libs.jakartaJson)
 
-    testImplementation(project(":core:common:junit"))
+    testImplementation(project(":tests:junit-base"));
     testImplementation(project(":extensions:common:json-ld"))
 }

core/common/validator-core/build.gradle.kts

@@ -24,5 +24,6 @@ dependencies {
 
     api(libs.jakartaJson)
 
-    testImplementation(project(":core:common:junit"))
+    testImplementation(project(":tests:junit-base"));
+
 }

core/control-plane/catalog-core/build.gradle.kts

@@ -21,7 +21,8 @@ dependencies {
     api(project(":spi:control-plane:contract-spi"))
     api(project(":spi:control-plane:transfer-spi"))
 
-    testImplementation(project(":core:common:junit"))
+    testImplementation(project(":tests:junit-base"));
+
     testImplementation(project(":core:common:connector-core"))
     testImplementation(project(":core:control-plane:control-plane-core"))
 }

core/data-plane/data-plane-util/build.gradle.kts

@@ -23,7 +23,8 @@ dependencies {
 
     implementation(libs.opentelemetry.instrumentation.annotations)
 
-    testImplementation(project(":core:common:junit"))
+    testImplementation(project(":tests:junit-base"));
+
 }
 
 

extensions/common/http/jetty-core/build.gradle.kts

@@ -25,7 +25,8 @@ dependencies {
     api(project(":spi:common:web-spi"))
 
     testImplementation(libs.restAssured)
-    testImplementation(project(":core:common:junit"))
+    testImplementation(project(":tests:junit-base"));
+
 }
 
 

extensions/common/iam/decentralized-identity/identity-did-core/build.gradle.kts

@@ -11,7 +11,8 @@ dependencies {
 
     implementation(libs.bouncyCastle.bcpkixJdk18on)
 
-    testImplementation(project(":core:common:junit"))
+    testImplementation(project(":tests:junit-base"));
+
 }
 
 

extensions/common/iam/decentralized-identity/identity-did-web/build.gradle.kts

@@ -8,7 +8,7 @@ dependencies {
     api(project(":spi:common:http-spi"))
     api(project(":core:common:util"))
 
-    testImplementation(project(":core:common:junit"))
+    testImplementation(testFixtures(project(":core:common:lib:http-lib")))
 }
 
 

extensions/common/iam/decentralized-identity/identity-did-web/src/test/java/org/eclipse/edc/iam/did/web/resolution/WebDidResolverTest.java

@@ -28,7 +28,7 @@
 
 import static okhttp3.Protocol.HTTP_1_1;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.eclipse.edc.junit.testfixtures.TestUtils.testHttpClient;
+import static org.eclipse.http.client.testfixtures.HttpTestUtils.testHttpClient;
 import static org.mockito.Mockito.mock;
 
 class WebDidResolverTest {

extensions/common/iam/oauth2/oauth2-client/build.gradle.kts

@@ -20,8 +20,8 @@ dependencies {
     api(project(":spi:common:http-spi"))
     api(project(":spi:common:oauth2-spi"))
 
-    testImplementation(project(":core:common:junit"))
-
+    testImplementation(project(":core:common:util"))
+    testImplementation(testFixtures(project(":core:common:lib:http-lib")))
     testImplementation(libs.mockserver.netty)
     testImplementation(libs.mockserver.client)
 }

extensions/common/iam/oauth2/oauth2-client/src/test/java/org/eclipse/edc/iam/oauth2/client/Oauth2ClientImplTest.java

@@ -30,8 +30,8 @@
 import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.eclipse.edc.junit.testfixtures.TestUtils.testHttpClient;
 import static org.eclipse.edc.util.io.Ports.getFreePort;
+import static org.eclipse.http.client.testfixtures.HttpTestUtils.testHttpClient;
 import static org.mockserver.integration.ClientAndServer.startClientAndServer;
 import static org.mockserver.model.MediaType.APPLICATION_JSON;
 

extensions/common/iam/oauth2/oauth2-core/build.gradle.kts

@@ -26,6 +26,7 @@ dependencies {
     implementation(libs.nimbus.jwt)
 
     testImplementation(project(":core:common:junit"))
+    testImplementation(testFixtures(project(":core:common:lib:http-lib")))
 
     testImplementation(libs.mockserver.netty)
     testImplementation(libs.mockserver.client)

extensions/common/iam/oauth2/oauth2-core/src/test/java/org/eclipse/edc/iam/oauth2/identity/IdentityProviderKeyResolverTest.java

@@ -38,7 +38,7 @@
 import static java.util.Collections.emptyMap;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.eclipse.edc.junit.testfixtures.TestUtils.testHttpClient;
+import static org.eclipse.http.client.testfixtures.HttpTestUtils.testHttpClient;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;

extensions/common/json-ld/build.gradle.kts

@@ -26,7 +26,8 @@ dependencies {
     api(project(":spi:common:json-ld-spi"))
     api(project(":spi:common:transform-spi"))
 
-    testImplementation(project(":core:common:junit"))
+    testImplementation(project(":core:common:junit"));
+
     testImplementation(libs.mockserver.netty)
     testImplementation(libs.mockserver.client)
 }

extensions/common/transaction/transaction-local/build.gradle.kts

@@ -22,7 +22,8 @@ dependencies {
     api(project(":spi:common:transaction-spi"))
     implementation(project(":spi:common:transaction-datasource-spi"))
 
-    testImplementation(project(":core:common:junit"))
+    testImplementation(project(":tests:junit-base"));
+
     testImplementation(testFixtures(project(":extensions:common:sql:sql-core")))
 }
 

extensions/common/validator/validator-data-address-http-data/build.gradle.kts

@@ -22,6 +22,7 @@ dependencies {
     api(project(":spi:common:validator-spi"))
     api(project(":spi:common:data-address:data-address-http-data-spi"))
 
-    testImplementation(project(":core:common:junit"))
+    testImplementation(project(":tests:junit-base"));
+
 }
 

extensions/common/validator/validator-data-address-kafka/build.gradle.kts

@@ -22,5 +22,6 @@ dependencies {
     api(project(":spi:common:validator-spi"))
     api(project(":spi:common:data-address:data-address-kafka-spi"))
 
-    testImplementation(project(":core:common:junit"))
+    testImplementation(project(":tests:junit-base"));
+
 }

extensions/common/vault/vault-hashicorp/build.gradle.kts

@@ -22,6 +22,7 @@ dependencies {
     implementation(project(":core:common:util"))
 
     testImplementation(project(":core:common:connector-core"))
+    testImplementation(testFixtures(project(":core:common:lib:http-lib")))
     testImplementation(project(":core:common:junit"))
     testImplementation(libs.jakartaJson)
     testImplementation(libs.testcontainers.junit)

extensions/common/vault/vault-hashicorp/src/test/java/org/eclipse/edc/vault/hashicorp/HashicorpVaultClientIntegrationTest.java

@@ -17,7 +17,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.json.Json;
 import org.eclipse.edc.junit.annotations.ComponentTest;
-import org.eclipse.edc.junit.testfixtures.TestUtils;
 import org.eclipse.edc.spi.monitor.ConsoleMonitor;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -33,6 +32,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat;
+import static org.eclipse.http.client.testfixtures.HttpTestUtils.testHttpClient;
 import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
 
 @ComponentTest
@@ -58,7 +58,7 @@ class HashicorpVaultClientIntegrationTest {
     void beforeEach() throws IOException, InterruptedException {
         assertThat(CREATION_TTL).isGreaterThan(TTL);
         client = new HashicorpVaultClient(
-                TestUtils.testHttpClient(),
+                testHttpClient(),
                 OBJECT_MAPPER,
                 MONITOR,
                 getSettings()

extensions/control-plane/api/control-plane-api-client/build.gradle.kts

@@ -30,6 +30,8 @@ dependencies {
     testImplementation(project(":extensions:common:auth:auth-tokenbased"))
     testImplementation(libs.awaitility)
 
+    testImplementation(testFixtures(project(":core:common:lib:http-lib")))
+
 }
 
 

extensions/control-plane/api/control-plane-api-client/src/test/java/org/eclipse/edc/connector/api/client/transferprocess/TransferProcessHttpClientTest.java

@@ -31,7 +31,7 @@
 
 import static okhttp3.Protocol.HTTP_1_1;
 import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat;
-import static org.eclipse.edc.junit.testfixtures.TestUtils.testHttpClient;
+import static org.eclipse.http.client.testfixtures.HttpTestUtils.testHttpClient;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;

extensions/control-plane/callback/callback-http-dispatcher/build.gradle.kts

@@ -12,6 +12,7 @@ dependencies {
 
     testImplementation(libs.mockserver.netty)
     testImplementation(libs.mockserver.client)
+    testImplementation(testFixtures(project(":core:common:lib:http-lib")))
     testImplementation(project(":core:common:junit"))
 
 }

extensions/control-plane/callback/callback-http-dispatcher/src/test/java/org/eclipse/edc/connector/callback/dispatcher/http/GenericHttpRemoteDispatcherWrapperTest.java

@@ -40,8 +40,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.eclipse.edc.connector.callback.dispatcher.http.GenericHttpRemoteDispatcherImpl.CALLBACK_EVENT_HTTP;
-import static org.eclipse.edc.junit.testfixtures.TestUtils.testHttpClient;
 import static org.eclipse.edc.util.io.Ports.getFreePort;
+import static org.eclipse.http.client.testfixtures.HttpTestUtils.testHttpClient;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.atMostOnce;
 import static org.mockito.Mockito.mock;

extensions/control-plane/provision/provision-http/build.gradle.kts

@@ -33,6 +33,7 @@ dependencies {
     testImplementation(project(":core:data-plane-selector:data-plane-selector-core"))
     testImplementation(project(":extensions:common:http"))
     testImplementation(project(":extensions:common:json-ld"))
+    testImplementation(testFixtures(project(":core:common:lib:http-lib")))
     testImplementation(testFixtures(project(":extensions:common:http:jersey-core")))
     testImplementation(libs.restAssured)
     testImplementation(libs.awaitility)

extensions/control-plane/provision/provision-http/src/test/java/org/eclipse/edc/connector/provision/http/impl/HttpProviderProvisionerTest.java

@@ -33,7 +33,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.eclipse.edc.connector.provision.http.HttpProvisionerFixtures.createResponse;
 import static org.eclipse.edc.connector.provision.http.config.ProvisionerConfiguration.ProvisionerType.PROVIDER;
-import static org.eclipse.edc.junit.testfixtures.TestUtils.testHttpClient;
+import static org.eclipse.http.client.testfixtures.HttpTestUtils.testHttpClient;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;

extensions/control-plane/provision/provision-http/src/test/java/org/eclipse/edc/connector/provision/http/impl/HttpProvisionerExtensionEndToEndTest.java

@@ -66,8 +66,8 @@
 import static org.eclipse.edc.connector.provision.http.HttpProvisionerFixtures.createResponse;
 import static org.eclipse.edc.connector.transfer.spi.types.TransferProcessStates.PROVISIONING_REQUESTED;
 import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat;
-import static org.eclipse.edc.junit.testfixtures.TestUtils.testHttpClient;
 import static org.eclipse.edc.util.io.Ports.getFreePort;
+import static org.eclipse.http.client.testfixtures.HttpTestUtils.testHttpClient;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.isA;

extensions/control-plane/transfer/transfer-pull-http-dynamic-receiver/build.gradle.kts

@@ -28,7 +28,8 @@ dependencies {
     testImplementation(project(":spi:common:data-address:data-address-http-data-spi"))
     testImplementation(libs.mockserver.netty)
     testImplementation(libs.mockserver.client)
-    testImplementation(project(":core:common:junit"))
+
+    testImplementation(testFixtures(project(":core:common:lib:http-lib")))
 
 
 }

extensions/control-plane/transfer/transfer-pull-http-dynamic-receiver/src/test/java/org/eclipse/edc/connector/receiver/http/dynamic/HttpDynamicEndpointDataReferenceReceiverTest.java

@@ -40,8 +40,8 @@
 import static org.eclipse.edc.connector.receiver.http.dynamic.HttpDynamicEndpointDataReferenceReceiver.HTTP_RECEIVER_ENDPOINT;
 import static org.eclipse.edc.connector.receiver.http.dynamic.TestFunctions.createTransferProcess;
 import static org.eclipse.edc.connector.receiver.http.dynamic.TestFunctions.transferProperties;
-import static org.eclipse.edc.junit.testfixtures.TestUtils.testOkHttpClient;
 import static org.eclipse.edc.util.io.Ports.getFreePort;
+import static org.eclipse.http.client.testfixtures.HttpTestUtils.testOkHttpClient;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.atMostOnce;

extensions/control-plane/transfer/transfer-pull-http-receiver/build.gradle.kts

@@ -24,7 +24,9 @@ dependencies {
 
     testImplementation(libs.mockserver.netty)
     testImplementation(libs.mockserver.client)
-    testImplementation(project(":core:common:junit"))
+
+    testImplementation(testFixtures(project(":core:common:lib:http-lib")))
+
 }
 
 

extensions/control-plane/transfer/transfer-pull-http-receiver/src/test/java/org/eclipse/edc/connector/receiver/http/HttpEndpointDataReferenceReceiverTest.java

@@ -34,8 +34,8 @@
 import java.util.concurrent.ExecutionException;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.eclipse.edc.junit.testfixtures.TestUtils.testHttpClient;
 import static org.eclipse.edc.util.io.Ports.getFreePort;
+import static org.eclipse.http.client.testfixtures.HttpTestUtils.testHttpClient;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.mock;
 import static org.mockserver.integration.ClientAndServer.startClientAndServer;