From 73317e31a5de16b512dfba246f05b68770206c4a Mon Sep 17 00:00:00 2001 From: Jim Marino Date: Mon, 25 Mar 2024 09:31:40 +0100 Subject: [PATCH] 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 | 3 +- core/common/lib/http-lib/build.gradle.kts | 2 + .../client/testfixtures/HttpTestUtils.java | 63 +++++++++++++++++++ core/common/lib/keys-lib/build.gradle.kts | 2 +- core/common/policy-engine/build.gradle.kts | 2 +- core/common/transform-core/build.gradle.kts | 2 +- core/common/validator-core/build.gradle.kts | 3 +- .../catalog-core/build.gradle.kts | 3 +- .../data-plane-util/build.gradle.kts | 3 +- .../common/http/jetty-core/build.gradle.kts | 3 +- .../identity-did-core/build.gradle.kts | 3 +- .../identity-did-web/build.gradle.kts | 2 +- .../web/resolution/WebDidResolverTest.java | 2 +- .../iam/oauth2/oauth2-client/build.gradle.kts | 4 +- .../oauth2/client/Oauth2ClientImplTest.java | 2 +- .../iam/oauth2/oauth2-core/build.gradle.kts | 1 + .../IdentityProviderKeyResolverTest.java | 2 +- extensions/common/json-ld/build.gradle.kts | 3 +- .../transaction-local/build.gradle.kts | 3 +- .../build.gradle.kts | 3 +- .../build.gradle.kts | 3 +- .../vault/vault-hashicorp/build.gradle.kts | 1 + .../HashicorpVaultClientIntegrationTest.java | 4 +- .../control-plane-api-client/build.gradle.kts | 2 + .../TransferProcessHttpClientTest.java | 2 +- .../callback-http-dispatcher/build.gradle.kts | 1 + ...enericHttpRemoteDispatcherWrapperTest.java | 2 +- .../provision/provision-http/build.gradle.kts | 1 + .../impl/HttpProviderProvisionerTest.java | 2 +- .../HttpProvisionerExtensionEndToEndTest.java | 2 +- .../build.gradle.kts | 3 +- ...amicEndpointDataReferenceReceiverTest.java | 2 +- .../build.gradle.kts | 4 +- ...HttpEndpointDataReferenceReceiverTest.java | 2 +- .../build.gradle.kts | 2 + .../RemoteDataPlaneSelectorServiceTest.java | 2 +- .../data-plane-client/build.gradle.kts | 2 + .../client/RemoteDataPlaneClientTest.java | 2 +- .../data-plane-http/build.gradle.kts | 1 + .../pipeline/DataSourceToDataSinkTests.java | 2 +- .../http/pipeline/HttpDataSourceTest.java | 2 +- .../data-plane-public-api/build.gradle.kts | 2 + ...erPullTransferDataAddressResolverTest.java | 2 +- .../build.gradle.kts | 2 + .../client/DataPlaneSignalingClientTest.java | 2 +- settings.gradle.kts | 3 + spi/common/core-spi/build.gradle.kts | 2 +- .../contract-spi/build.gradle.kts | 2 +- .../sts-api-test-runner/build.gradle.kts | 2 + .../e2e/sts/api/RemoteStsEndToEndTest.java | 2 +- tests/junit-base/build.gradle.kts | 30 +++++++++ .../assertions/AbstractResultAssert.java | 0 .../edc/junit/assertions/FailureAssert.java | 0 .../edc/junit/testfixtures/TestUtils.java | 38 ----------- 54 files changed, 166 insertions(+), 76 deletions(-) create mode 100644 core/common/lib/http-lib/src/testFixtures/java/org/eclipse/http/client/testfixtures/HttpTestUtils.java create mode 100644 tests/junit-base/build.gradle.kts rename {core/common/junit => tests/junit-base}/src/main/java/org/eclipse/edc/junit/assertions/AbstractResultAssert.java (100%) rename {core/common/junit => tests/junit-base}/src/main/java/org/eclipse/edc/junit/assertions/FailureAssert.java (100%) rename {core/common/junit => tests/junit-base}/src/main/java/org/eclipse/edc/junit/testfixtures/TestUtils.java (71%) diff --git a/core/common/junit/build.gradle.kts b/core/common/junit/build.gradle.kts index d8be1fcf253..744f74b0732 100644 --- a/core/common/junit/build.gradle.kts +++ b/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")) } diff --git a/core/common/lib/http-lib/build.gradle.kts b/core/common/lib/http-lib/build.gradle.kts index 2105c04154d..ac6def9dee4 100644 --- a/core/common/lib/http-lib/build.gradle.kts +++ b/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) } diff --git a/core/common/lib/http-lib/src/testFixtures/java/org/eclipse/http/client/testfixtures/HttpTestUtils.java b/core/common/lib/http-lib/src/testFixtures/java/org/eclipse/http/client/testfixtures/HttpTestUtils.java new file mode 100644 index 00000000000..68dea83b1e9 --- /dev/null +++ b/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() { + } +} diff --git a/core/common/lib/keys-lib/build.gradle.kts b/core/common/lib/keys-lib/build.gradle.kts index a6c1cf2dc49..836aaa986bc 100644 --- a/core/common/lib/keys-lib/build.gradle.kts +++ b/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")); } diff --git a/core/common/policy-engine/build.gradle.kts b/core/common/policy-engine/build.gradle.kts index 57391b2e950..e3e62876057 100644 --- a/core/common/policy-engine/build.gradle.kts +++ b/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")); } diff --git a/core/common/transform-core/build.gradle.kts b/core/common/transform-core/build.gradle.kts index 5913d6c63bc..29547adfcb1 100644 --- a/core/common/transform-core/build.gradle.kts +++ b/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")) } diff --git a/core/common/validator-core/build.gradle.kts b/core/common/validator-core/build.gradle.kts index 54529b8999e..795dc362b84 100644 --- a/core/common/validator-core/build.gradle.kts +++ b/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")); + } diff --git a/core/control-plane/catalog-core/build.gradle.kts b/core/control-plane/catalog-core/build.gradle.kts index 8a3077fbb3b..43bdafcb762 100644 --- a/core/control-plane/catalog-core/build.gradle.kts +++ b/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")) } diff --git a/core/data-plane/data-plane-util/build.gradle.kts b/core/data-plane/data-plane-util/build.gradle.kts index 95581c67078..cbd663b8c1f 100644 --- a/core/data-plane/data-plane-util/build.gradle.kts +++ b/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")); + } diff --git a/extensions/common/http/jetty-core/build.gradle.kts b/extensions/common/http/jetty-core/build.gradle.kts index 8b51286bacb..9681ad1590d 100644 --- a/extensions/common/http/jetty-core/build.gradle.kts +++ b/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")); + } diff --git a/extensions/common/iam/decentralized-identity/identity-did-core/build.gradle.kts b/extensions/common/iam/decentralized-identity/identity-did-core/build.gradle.kts index 487cfde3aa2..17200cbef27 100644 --- a/extensions/common/iam/decentralized-identity/identity-did-core/build.gradle.kts +++ b/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")); + } diff --git a/extensions/common/iam/decentralized-identity/identity-did-web/build.gradle.kts b/extensions/common/iam/decentralized-identity/identity-did-web/build.gradle.kts index e16160067f6..cdb3ba74fc1 100644 --- a/extensions/common/iam/decentralized-identity/identity-did-web/build.gradle.kts +++ b/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"))) } diff --git a/extensions/common/iam/decentralized-identity/identity-did-web/src/test/java/org/eclipse/edc/iam/did/web/resolution/WebDidResolverTest.java b/extensions/common/iam/decentralized-identity/identity-did-web/src/test/java/org/eclipse/edc/iam/did/web/resolution/WebDidResolverTest.java index 0e43d021126..34a2556cbe1 100644 --- a/extensions/common/iam/decentralized-identity/identity-did-web/src/test/java/org/eclipse/edc/iam/did/web/resolution/WebDidResolverTest.java +++ b/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 { diff --git a/extensions/common/iam/oauth2/oauth2-client/build.gradle.kts b/extensions/common/iam/oauth2/oauth2-client/build.gradle.kts index a1db5ddfa2d..34c73e88f5a 100644 --- a/extensions/common/iam/oauth2/oauth2-client/build.gradle.kts +++ b/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) } diff --git a/extensions/common/iam/oauth2/oauth2-client/src/test/java/org/eclipse/edc/iam/oauth2/client/Oauth2ClientImplTest.java b/extensions/common/iam/oauth2/oauth2-client/src/test/java/org/eclipse/edc/iam/oauth2/client/Oauth2ClientImplTest.java index d146061f38d..11c26959584 100644 --- a/extensions/common/iam/oauth2/oauth2-client/src/test/java/org/eclipse/edc/iam/oauth2/client/Oauth2ClientImplTest.java +++ b/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; diff --git a/extensions/common/iam/oauth2/oauth2-core/build.gradle.kts b/extensions/common/iam/oauth2/oauth2-core/build.gradle.kts index 8c215b6ef6b..fbd0773bfe8 100644 --- a/extensions/common/iam/oauth2/oauth2-core/build.gradle.kts +++ b/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) diff --git a/extensions/common/iam/oauth2/oauth2-core/src/test/java/org/eclipse/edc/iam/oauth2/identity/IdentityProviderKeyResolverTest.java b/extensions/common/iam/oauth2/oauth2-core/src/test/java/org/eclipse/edc/iam/oauth2/identity/IdentityProviderKeyResolverTest.java index da09f4c84bd..9148d1c6408 100644 --- a/extensions/common/iam/oauth2/oauth2-core/src/test/java/org/eclipse/edc/iam/oauth2/identity/IdentityProviderKeyResolverTest.java +++ b/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; diff --git a/extensions/common/json-ld/build.gradle.kts b/extensions/common/json-ld/build.gradle.kts index f4ffd0af8c3..0853fa3931c 100644 --- a/extensions/common/json-ld/build.gradle.kts +++ b/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) } diff --git a/extensions/common/transaction/transaction-local/build.gradle.kts b/extensions/common/transaction/transaction-local/build.gradle.kts index c620d7b4075..75d08644a36 100644 --- a/extensions/common/transaction/transaction-local/build.gradle.kts +++ b/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"))) } diff --git a/extensions/common/validator/validator-data-address-http-data/build.gradle.kts b/extensions/common/validator/validator-data-address-http-data/build.gradle.kts index ad531d96cda..a9b7263cc41 100644 --- a/extensions/common/validator/validator-data-address-http-data/build.gradle.kts +++ b/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")); + } diff --git a/extensions/common/validator/validator-data-address-kafka/build.gradle.kts b/extensions/common/validator/validator-data-address-kafka/build.gradle.kts index 12dd7a8e041..b99157a6342 100644 --- a/extensions/common/validator/validator-data-address-kafka/build.gradle.kts +++ b/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")); + } diff --git a/extensions/common/vault/vault-hashicorp/build.gradle.kts b/extensions/common/vault/vault-hashicorp/build.gradle.kts index b024a924e5e..58111c38884 100644 --- a/extensions/common/vault/vault-hashicorp/build.gradle.kts +++ b/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) diff --git a/extensions/common/vault/vault-hashicorp/src/test/java/org/eclipse/edc/vault/hashicorp/HashicorpVaultClientIntegrationTest.java b/extensions/common/vault/vault-hashicorp/src/test/java/org/eclipse/edc/vault/hashicorp/HashicorpVaultClientIntegrationTest.java index ac793adbd50..323cda53294 100644 --- a/extensions/common/vault/vault-hashicorp/src/test/java/org/eclipse/edc/vault/hashicorp/HashicorpVaultClientIntegrationTest.java +++ b/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() diff --git a/extensions/control-plane/api/control-plane-api-client/build.gradle.kts b/extensions/control-plane/api/control-plane-api-client/build.gradle.kts index be2ecdbd69c..a5ca7d5e06a 100644 --- a/extensions/control-plane/api/control-plane-api-client/build.gradle.kts +++ b/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"))) + } diff --git a/extensions/control-plane/api/control-plane-api-client/src/test/java/org/eclipse/edc/connector/api/client/transferprocess/TransferProcessHttpClientTest.java b/extensions/control-plane/api/control-plane-api-client/src/test/java/org/eclipse/edc/connector/api/client/transferprocess/TransferProcessHttpClientTest.java index 6f1ce7acb8d..6d71c0748d5 100644 --- a/extensions/control-plane/api/control-plane-api-client/src/test/java/org/eclipse/edc/connector/api/client/transferprocess/TransferProcessHttpClientTest.java +++ b/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; diff --git a/extensions/control-plane/callback/callback-http-dispatcher/build.gradle.kts b/extensions/control-plane/callback/callback-http-dispatcher/build.gradle.kts index 86d139381c5..cbad03a923c 100644 --- a/extensions/control-plane/callback/callback-http-dispatcher/build.gradle.kts +++ b/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")) } diff --git a/extensions/control-plane/callback/callback-http-dispatcher/src/test/java/org/eclipse/edc/connector/callback/dispatcher/http/GenericHttpRemoteDispatcherWrapperTest.java b/extensions/control-plane/callback/callback-http-dispatcher/src/test/java/org/eclipse/edc/connector/callback/dispatcher/http/GenericHttpRemoteDispatcherWrapperTest.java index 7e485f9cae4..092c7ff9a23 100644 --- a/extensions/control-plane/callback/callback-http-dispatcher/src/test/java/org/eclipse/edc/connector/callback/dispatcher/http/GenericHttpRemoteDispatcherWrapperTest.java +++ b/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; diff --git a/extensions/control-plane/provision/provision-http/build.gradle.kts b/extensions/control-plane/provision/provision-http/build.gradle.kts index 4c6d1f151f3..1ff7f173cd2 100644 --- a/extensions/control-plane/provision/provision-http/build.gradle.kts +++ b/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) diff --git a/extensions/control-plane/provision/provision-http/src/test/java/org/eclipse/edc/connector/provision/http/impl/HttpProviderProvisionerTest.java b/extensions/control-plane/provision/provision-http/src/test/java/org/eclipse/edc/connector/provision/http/impl/HttpProviderProvisionerTest.java index c653dd7f7e8..37ca3f8c157 100644 --- a/extensions/control-plane/provision/provision-http/src/test/java/org/eclipse/edc/connector/provision/http/impl/HttpProviderProvisionerTest.java +++ b/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; diff --git a/extensions/control-plane/provision/provision-http/src/test/java/org/eclipse/edc/connector/provision/http/impl/HttpProvisionerExtensionEndToEndTest.java b/extensions/control-plane/provision/provision-http/src/test/java/org/eclipse/edc/connector/provision/http/impl/HttpProvisionerExtensionEndToEndTest.java index 9c7abdaedfb..7127d7d1006 100644 --- a/extensions/control-plane/provision/provision-http/src/test/java/org/eclipse/edc/connector/provision/http/impl/HttpProvisionerExtensionEndToEndTest.java +++ b/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; diff --git a/extensions/control-plane/transfer/transfer-pull-http-dynamic-receiver/build.gradle.kts b/extensions/control-plane/transfer/transfer-pull-http-dynamic-receiver/build.gradle.kts index b68d9f084ec..2d6910602fe 100644 --- a/extensions/control-plane/transfer/transfer-pull-http-dynamic-receiver/build.gradle.kts +++ b/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"))) } diff --git a/extensions/control-plane/transfer/transfer-pull-http-dynamic-receiver/src/test/java/org/eclipse/edc/connector/receiver/http/dynamic/HttpDynamicEndpointDataReferenceReceiverTest.java b/extensions/control-plane/transfer/transfer-pull-http-dynamic-receiver/src/test/java/org/eclipse/edc/connector/receiver/http/dynamic/HttpDynamicEndpointDataReferenceReceiverTest.java index 6b752e8ef82..dba565b492f 100644 --- a/extensions/control-plane/transfer/transfer-pull-http-dynamic-receiver/src/test/java/org/eclipse/edc/connector/receiver/http/dynamic/HttpDynamicEndpointDataReferenceReceiverTest.java +++ b/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; diff --git a/extensions/control-plane/transfer/transfer-pull-http-receiver/build.gradle.kts b/extensions/control-plane/transfer/transfer-pull-http-receiver/build.gradle.kts index 8c538b44bb3..7fca5a2477a 100644 --- a/extensions/control-plane/transfer/transfer-pull-http-receiver/build.gradle.kts +++ b/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"))) + } diff --git a/extensions/control-plane/transfer/transfer-pull-http-receiver/src/test/java/org/eclipse/edc/connector/receiver/http/HttpEndpointDataReferenceReceiverTest.java b/extensions/control-plane/transfer/transfer-pull-http-receiver/src/test/java/org/eclipse/edc/connector/receiver/http/HttpEndpointDataReferenceReceiverTest.java index 5d37523c3ed..e4ece7a7689 100644 --- a/extensions/control-plane/transfer/transfer-pull-http-receiver/src/test/java/org/eclipse/edc/connector/receiver/http/HttpEndpointDataReferenceReceiverTest.java +++ b/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; diff --git a/extensions/data-plane-selector/data-plane-selector-client/build.gradle.kts b/extensions/data-plane-selector/data-plane-selector-client/build.gradle.kts index 80573b61b81..afaa97df120 100644 --- a/extensions/data-plane-selector/data-plane-selector-client/build.gradle.kts +++ b/extensions/data-plane-selector/data-plane-selector-client/build.gradle.kts @@ -29,6 +29,8 @@ dependencies { testImplementation(project(":core:common:junit")) testImplementation(project(":core:common:transform-core")) testImplementation(project(":core:common:jersey-providers")) + + testImplementation(testFixtures(project(":core:common:lib:http-lib"))) testImplementation(testFixtures(project(":extensions:common:http:jersey-core"))) } diff --git a/extensions/data-plane-selector/data-plane-selector-client/src/test/java/org/eclipse/edc/connector/dataplane/selector/RemoteDataPlaneSelectorServiceTest.java b/extensions/data-plane-selector/data-plane-selector-client/src/test/java/org/eclipse/edc/connector/dataplane/selector/RemoteDataPlaneSelectorServiceTest.java index 767ee830665..78a59de9294 100644 --- a/extensions/data-plane-selector/data-plane-selector-client/src/test/java/org/eclipse/edc/connector/dataplane/selector/RemoteDataPlaneSelectorServiceTest.java +++ b/extensions/data-plane-selector/data-plane-selector-client/src/test/java/org/eclipse/edc/connector/dataplane/selector/RemoteDataPlaneSelectorServiceTest.java @@ -44,8 +44,8 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThat; -import static org.eclipse.edc.junit.testfixtures.TestUtils.testHttpClient; import static org.eclipse.edc.spi.CoreConstants.JSON_LD; +import static org.eclipse.http.client.testfixtures.HttpTestUtils.testHttpClient; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; diff --git a/extensions/data-plane/data-plane-client/build.gradle.kts b/extensions/data-plane/data-plane-client/build.gradle.kts index ca56c68ec64..b6000efe40a 100644 --- a/extensions/data-plane/data-plane-client/build.gradle.kts +++ b/extensions/data-plane/data-plane-client/build.gradle.kts @@ -31,6 +31,8 @@ dependencies { testImplementation(libs.restAssured) testImplementation(libs.mockserver.netty) testImplementation(libs.mockserver.client) + + testImplementation(testFixtures(project(":core:common:lib:http-lib"))) } diff --git a/extensions/data-plane/data-plane-client/src/test/java/org/eclipse/edc/connector/dataplane/client/RemoteDataPlaneClientTest.java b/extensions/data-plane/data-plane-client/src/test/java/org/eclipse/edc/connector/dataplane/client/RemoteDataPlaneClientTest.java index 11f38b75101..687d4f6a6ef 100644 --- a/extensions/data-plane/data-plane-client/src/test/java/org/eclipse/edc/connector/dataplane/client/RemoteDataPlaneClientTest.java +++ b/extensions/data-plane/data-plane-client/src/test/java/org/eclipse/edc/connector/dataplane/client/RemoteDataPlaneClientTest.java @@ -40,8 +40,8 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThat; 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.mockserver.integration.ClientAndServer.startClientAndServer; import static org.mockserver.matchers.Times.once; import static org.mockserver.model.HttpResponse.response; diff --git a/extensions/data-plane/data-plane-http/build.gradle.kts b/extensions/data-plane/data-plane-http/build.gradle.kts index be0977e6d13..7b122f905c4 100644 --- a/extensions/data-plane/data-plane-http/build.gradle.kts +++ b/extensions/data-plane/data-plane-http/build.gradle.kts @@ -29,6 +29,7 @@ dependencies { testImplementation(libs.restAssured) testImplementation(libs.mockserver.netty) + testImplementation(testFixtures(project(":core:common:lib:http-lib"))) testImplementation(testFixtures(project(":spi:data-plane:data-plane-spi"))) } diff --git a/extensions/data-plane/data-plane-http/src/test/java/org/eclipse/edc/connector/dataplane/http/pipeline/DataSourceToDataSinkTests.java b/extensions/data-plane/data-plane-http/src/test/java/org/eclipse/edc/connector/dataplane/http/pipeline/DataSourceToDataSinkTests.java index 01194c7f20a..c9d294e9a76 100644 --- a/extensions/data-plane/data-plane-http/src/test/java/org/eclipse/edc/connector/dataplane/http/pipeline/DataSourceToDataSinkTests.java +++ b/extensions/data-plane/data-plane-http/src/test/java/org/eclipse/edc/connector/dataplane/http/pipeline/DataSourceToDataSinkTests.java @@ -41,7 +41,7 @@ import java.util.stream.Stream; 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.ArgumentMatchers.isA; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; diff --git a/extensions/data-plane/data-plane-http/src/test/java/org/eclipse/edc/connector/dataplane/http/pipeline/HttpDataSourceTest.java b/extensions/data-plane/data-plane-http/src/test/java/org/eclipse/edc/connector/dataplane/http/pipeline/HttpDataSourceTest.java index db2044c1699..78ae49e71d8 100644 --- a/extensions/data-plane/data-plane-http/src/test/java/org/eclipse/edc/connector/dataplane/http/pipeline/HttpDataSourceTest.java +++ b/extensions/data-plane/data-plane-http/src/test/java/org/eclipse/edc/connector/dataplane/http/pipeline/HttpDataSourceTest.java @@ -43,7 +43,7 @@ import static org.eclipse.edc.connector.dataplane.spi.pipeline.StreamFailure.Reason.GENERAL_ERROR; import static org.eclipse.edc.connector.dataplane.spi.pipeline.StreamFailure.Reason.NOT_AUTHORIZED; 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.junit.jupiter.params.provider.Arguments.arguments; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; diff --git a/extensions/data-plane/data-plane-public-api/build.gradle.kts b/extensions/data-plane/data-plane-public-api/build.gradle.kts index f8d8ba71851..491cd5f926d 100644 --- a/extensions/data-plane/data-plane-public-api/build.gradle.kts +++ b/extensions/data-plane/data-plane-public-api/build.gradle.kts @@ -35,6 +35,8 @@ dependencies { testImplementation(libs.restAssured) testImplementation(libs.mockserver.netty) testImplementation(libs.mockserver.client) + + testImplementation(testFixtures(project(":core:common:lib:http-lib"))) testImplementation(testFixtures(project(":extensions:common:http:jersey-core"))) } edcBuild { diff --git a/extensions/data-plane/data-plane-public-api/src/test/java/org/eclipse/edc/connector/dataplane/api/validation/ConsumerPullTransferDataAddressResolverTest.java b/extensions/data-plane/data-plane-public-api/src/test/java/org/eclipse/edc/connector/dataplane/api/validation/ConsumerPullTransferDataAddressResolverTest.java index d1526364aef..e3348dd583f 100644 --- a/extensions/data-plane/data-plane-public-api/src/test/java/org/eclipse/edc/connector/dataplane/api/validation/ConsumerPullTransferDataAddressResolverTest.java +++ b/extensions/data-plane/data-plane-public-api/src/test/java/org/eclipse/edc/connector/dataplane/api/validation/ConsumerPullTransferDataAddressResolverTest.java @@ -32,8 +32,8 @@ import java.util.UUID; 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.matchers.Times.once; import static org.mockserver.stop.Stop.stopQuietly; diff --git a/extensions/data-plane/data-plane-signaling/data-plane-signaling-client/build.gradle.kts b/extensions/data-plane/data-plane-signaling/data-plane-signaling-client/build.gradle.kts index 88d2653c3d9..2c9ac799178 100644 --- a/extensions/data-plane/data-plane-signaling/data-plane-signaling-client/build.gradle.kts +++ b/extensions/data-plane/data-plane-signaling/data-plane-signaling-client/build.gradle.kts @@ -34,6 +34,8 @@ dependencies { testImplementation(libs.restAssured) testImplementation(libs.mockserver.netty) testImplementation(libs.mockserver.client) + + testImplementation(testFixtures(project(":core:common:lib:http-lib"))) } diff --git a/extensions/data-plane/data-plane-signaling/data-plane-signaling-client/src/test/java/org/eclipse/edc/connector/dataplane/client/DataPlaneSignalingClientTest.java b/extensions/data-plane/data-plane-signaling/data-plane-signaling-client/src/test/java/org/eclipse/edc/connector/dataplane/client/DataPlaneSignalingClientTest.java index 93c8f8b668b..7a6a2e43f2e 100644 --- a/extensions/data-plane/data-plane-signaling/data-plane-signaling-client/src/test/java/org/eclipse/edc/connector/dataplane/client/DataPlaneSignalingClientTest.java +++ b/extensions/data-plane/data-plane-signaling/data-plane-signaling-client/src/test/java/org/eclipse/edc/connector/dataplane/client/DataPlaneSignalingClientTest.java @@ -62,9 +62,9 @@ import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.VOCAB; import static org.eclipse.edc.jsonld.util.JacksonJsonLd.createObjectMapper; import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat; -import static org.eclipse.edc.junit.testfixtures.TestUtils.testHttpClient; import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE; 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.mock; import static org.mockito.Mockito.when; diff --git a/settings.gradle.kts b/settings.gradle.kts index 4c3a7d3dddd..9d8569f4bc4 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -248,6 +248,9 @@ include(":spi:data-plane:data-plane-http-spi") include(":spi:data-plane-selector:data-plane-selector-spi") include(":spi:policy-monitor:policy-monitor-spi") +// modules for tests ------------------------------------------------------------------------ +include(":tests:junit-base") + // modules for system tests ------------------------------------------------------------------------ include(":system-tests:e2e-transfer-test:backend-service") include(":system-tests:e2e-transfer-test:control-plane") diff --git a/spi/common/core-spi/build.gradle.kts b/spi/common/core-spi/build.gradle.kts index 79443f23bd8..74fae8afe21 100644 --- a/spi/common/core-spi/build.gradle.kts +++ b/spi/common/core-spi/build.gradle.kts @@ -26,7 +26,7 @@ dependencies { implementation(libs.opentelemetry.api) - testImplementation(project(":core:common:junit")) + testImplementation(project(":tests:junit-base")); testFixturesImplementation(libs.bundles.jupiter) testFixturesImplementation(libs.mockito.core) diff --git a/spi/control-plane/contract-spi/build.gradle.kts b/spi/control-plane/contract-spi/build.gradle.kts index c7b19f23b0b..ecbc68dddb8 100644 --- a/spi/control-plane/contract-spi/build.gradle.kts +++ b/spi/control-plane/contract-spi/build.gradle.kts @@ -23,7 +23,7 @@ dependencies { api(project(":spi:common:policy-engine-spi")) api(project(":spi:control-plane:policy-spi")) - testImplementation(project(":core:common:junit")) + testImplementation(project(":tests:junit-base")); // needed by the abstract test spec located in testFixtures testFixturesImplementation(libs.bundles.jupiter) diff --git a/system-tests/sts-api/sts-api-test-runner/build.gradle.kts b/system-tests/sts-api/sts-api-test-runner/build.gradle.kts index 7ab434fcc65..0b43569f220 100644 --- a/system-tests/sts-api/sts-api-test-runner/build.gradle.kts +++ b/system-tests/sts-api/sts-api-test-runner/build.gradle.kts @@ -32,6 +32,8 @@ dependencies { testImplementation(testFixtures(project(":spi:common:identity-trust-sts-spi"))) testImplementation(libs.nimbus.jwt) testImplementation(libs.bouncyCastle.bcpkixJdk18on) + + testImplementation(testFixtures(project(":core:common:lib:http-lib"))) } edcBuild { diff --git a/system-tests/sts-api/sts-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/sts/api/RemoteStsEndToEndTest.java b/system-tests/sts-api/sts-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/sts/api/RemoteStsEndToEndTest.java index 8a81684ce22..252b627ee5a 100644 --- a/system-tests/sts-api/sts-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/sts/api/RemoteStsEndToEndTest.java +++ b/system-tests/sts-api/sts-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/sts/api/RemoteStsEndToEndTest.java @@ -39,9 +39,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.identitytrust.SelfIssuedTokenConstants.PRESENTATION_TOKEN_CLAIM; import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat; -import static org.eclipse.edc.junit.testfixtures.TestUtils.testHttpClient; import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.CLIENT_ID; import static org.eclipse.edc.util.io.Ports.getFreePort; +import static org.eclipse.http.client.testfixtures.HttpTestUtils.testHttpClient; @EndToEndTest public class RemoteStsEndToEndTest extends StsEndToEndTestBase { diff --git a/tests/junit-base/build.gradle.kts b/tests/junit-base/build.gradle.kts new file mode 100644 index 00000000000..9d22183134e --- /dev/null +++ b/tests/junit-base/build.gradle.kts @@ -0,0 +1,30 @@ +/* + * 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 + * + */ + +plugins { + `java-library` + `java-test-fixtures` + `maven-publish` +} + +dependencies { + + api(project(":spi:common:core-spi")) + + implementation(libs.assertj) + implementation(libs.junit.jupiter.api) + implementation(libs.testcontainers.junit) +} + + diff --git a/core/common/junit/src/main/java/org/eclipse/edc/junit/assertions/AbstractResultAssert.java b/tests/junit-base/src/main/java/org/eclipse/edc/junit/assertions/AbstractResultAssert.java similarity index 100% rename from core/common/junit/src/main/java/org/eclipse/edc/junit/assertions/AbstractResultAssert.java rename to tests/junit-base/src/main/java/org/eclipse/edc/junit/assertions/AbstractResultAssert.java diff --git a/core/common/junit/src/main/java/org/eclipse/edc/junit/assertions/FailureAssert.java b/tests/junit-base/src/main/java/org/eclipse/edc/junit/assertions/FailureAssert.java similarity index 100% rename from core/common/junit/src/main/java/org/eclipse/edc/junit/assertions/FailureAssert.java rename to tests/junit-base/src/main/java/org/eclipse/edc/junit/assertions/FailureAssert.java diff --git a/core/common/junit/src/main/java/org/eclipse/edc/junit/testfixtures/TestUtils.java b/tests/junit-base/src/main/java/org/eclipse/edc/junit/testfixtures/TestUtils.java similarity index 71% rename from core/common/junit/src/main/java/org/eclipse/edc/junit/testfixtures/TestUtils.java rename to tests/junit-base/src/main/java/org/eclipse/edc/junit/testfixtures/TestUtils.java index 642592c107f..0d8852372d0 100644 --- a/core/common/junit/src/main/java/org/eclipse/edc/junit/testfixtures/TestUtils.java +++ b/tests/junit-base/src/main/java/org/eclipse/edc/junit/testfixtures/TestUtils.java @@ -14,12 +14,6 @@ package org.eclipse.edc.junit.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.opentest4j.AssertionFailedError; import java.io.File; @@ -29,9 +23,6 @@ import java.nio.file.Files; import java.util.Objects; import java.util.Scanner; -import java.util.concurrent.TimeUnit; - -import static org.mockito.Mockito.mock; public class TestUtils { public static final String GRADLE_WRAPPER; @@ -81,35 +72,6 @@ public static String tempDirectory() { } } - /** - * 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(), mock(Monitor.class)); - } - /** * Utility method to locate the Gradle project root. * Search for build root will be done only once and cached for subsequent calls.