From e09833ddcb8790d5e626329ecf853896cfd4dfec Mon Sep 17 00:00:00 2001 From: ndr_brt Date: Tue, 11 Mar 2025 14:10:57 +0100 Subject: [PATCH] refactor: cleanup test dependencies --- core/common/boot/build.gradle.kts | 1 - core/common/connector-core/build.gradle.kts | 1 - core/common/junit/build.gradle.kts | 3 --- core/common/lib/http-lib/build.gradle.kts | 2 -- .../lib/dsp-catalog-http-api-lib/build.gradle.kts | 4 +--- data-protocols/dsp/dsp-http-spi/build.gradle.kts | 2 -- .../lib/dsp-negotiation-http-api-lib/build.gradle.kts | 5 +---- .../lib/dsp-transfer-process-http-api-lib/build.gradle.kts | 5 +---- extensions/common/http/jersey-core/build.gradle.kts | 2 -- extensions/common/sql/sql-bootstrapper/build.gradle.kts | 3 +-- extensions/common/sql/sql-lease/build.gradle.kts | 1 - extensions/common/sql/sql-test-fixtures/build.gradle.kts | 2 -- .../management-api-test-fixtures/build.gradle.kts | 4 ---- .../store/sql/asset-index-sql/build.gradle.kts | 1 - .../sql/contract-definition-store-sql/build.gradle.kts | 1 - .../sql/contract-negotiation-store-sql/build.gradle.kts | 1 - .../store/sql/transfer-process-store-sql/build.gradle.kts | 1 - .../data-plane-integration-tests/build.gradle.kts | 2 -- gradle/libs.versions.toml | 7 ++----- spi/common/core-spi/build.gradle.kts | 5 ----- spi/common/edr-store-spi/build.gradle.kts | 5 ----- spi/common/jwt-spi/build.gradle.kts | 2 -- spi/control-plane/asset-spi/build.gradle.kts | 6 ------ spi/control-plane/contract-spi/build.gradle.kts | 5 ----- spi/control-plane/policy-spi/build.gradle.kts | 3 --- spi/control-plane/transfer-spi/build.gradle.kts | 2 -- .../data-plane-selector-spi/build.gradle.kts | 4 ---- spi/data-plane/data-plane-http-spi/build.gradle.kts | 3 --- spi/data-plane/data-plane-spi/build.gradle.kts | 2 -- spi/policy-monitor/policy-monitor-spi/build.gradle.kts | 2 -- system-tests/bom-tests/build.gradle.kts | 1 - .../compatibility-test-runner/build.gradle.kts | 1 - system-tests/e2e-dataplane-tests/tests/build.gradle.kts | 2 -- system-tests/e2e-transfer-test/runner/build.gradle.kts | 2 -- .../management-api-test-runner/build.gradle.kts | 2 -- .../telemetry/telemetry-test-runner/build.gradle.kts | 2 -- .../version-api/version-api-test-runner/build.gradle.kts | 2 -- tests/junit-base/build.gradle.kts | 2 -- .../java/org/eclipse/edc/junit/testfixtures/TestUtils.java | 6 ++---- 39 files changed, 8 insertions(+), 99 deletions(-) diff --git a/core/common/boot/build.gradle.kts b/core/common/boot/build.gradle.kts index 442d1d9c3ef..eb1e6fdb322 100644 --- a/core/common/boot/build.gradle.kts +++ b/core/common/boot/build.gradle.kts @@ -23,7 +23,6 @@ dependencies { implementation(project(":core:common:lib:boot-lib")) implementation(libs.opentelemetry.api) - testImplementation(libs.junit.jupiter.api) } diff --git a/core/common/connector-core/build.gradle.kts b/core/common/connector-core/build.gradle.kts index 76d7dd59e83..6a06d5ce806 100644 --- a/core/common/connector-core/build.gradle.kts +++ b/core/common/connector-core/build.gradle.kts @@ -46,7 +46,6 @@ dependencies { testImplementation(project(":core:common:junit")) testImplementation(libs.awaitility) - testImplementation(libs.junit.jupiter.api) testImplementation(libs.mockserver.netty) } diff --git a/core/common/junit/build.gradle.kts b/core/common/junit/build.gradle.kts index 8cb0a096640..29b504aea65 100644 --- a/core/common/junit/build.gradle.kts +++ b/core/common/junit/build.gradle.kts @@ -30,11 +30,8 @@ dependencies { implementation(project(":spi:common:http-spi")) implementation(libs.okhttp) implementation(libs.mockito.core) - implementation(libs.assertj) implementation(libs.junit.jupiter.api) - runtimeOnly(libs.junit.jupiter.engine) - implementation(libs.testcontainers.junit) testImplementation(project(":core:common:connector-core")) diff --git a/core/common/lib/http-lib/build.gradle.kts b/core/common/lib/http-lib/build.gradle.kts index 746c2b7508e..f5bba72d612 100644 --- a/core/common/lib/http-lib/build.gradle.kts +++ b/core/common/lib/http-lib/build.gradle.kts @@ -29,8 +29,6 @@ dependencies { testImplementation(project(":core:common:lib:json-lib")) testImplementation(project(":core:common:lib:util-lib")) testImplementation(libs.mockserver.netty) - - testFixturesImplementation(libs.mockito.core) } diff --git a/data-protocols/dsp/dsp-catalog/lib/dsp-catalog-http-api-lib/build.gradle.kts b/data-protocols/dsp/dsp-catalog/lib/dsp-catalog-http-api-lib/build.gradle.kts index db9e00e36aa..5daef35ec64 100644 --- a/data-protocols/dsp/dsp-catalog/lib/dsp-catalog-http-api-lib/build.gradle.kts +++ b/data-protocols/dsp/dsp-catalog/lib/dsp-catalog-http-api-lib/build.gradle.kts @@ -30,6 +30,4 @@ dependencies { testFixturesApi(project(":core:common:junit")) testFixturesImplementation(testFixtures(project(":extensions:common:http:jersey-core"))) testFixturesImplementation(libs.restAssured) - testFixturesImplementation(libs.assertj) - testFixturesImplementation(libs.mockito.core) -} \ No newline at end of file +} diff --git a/data-protocols/dsp/dsp-http-spi/build.gradle.kts b/data-protocols/dsp/dsp-http-spi/build.gradle.kts index c75b024d647..92427afeca0 100644 --- a/data-protocols/dsp/dsp-http-spi/build.gradle.kts +++ b/data-protocols/dsp/dsp-http-spi/build.gradle.kts @@ -28,6 +28,4 @@ dependencies { testFixturesApi(project(":core:common:junit")) testFixturesApi(project(":spi:common:json-ld-spi")) - testFixturesImplementation(libs.mockito.core) - testFixturesImplementation(libs.assertj) } diff --git a/data-protocols/dsp/dsp-negotiation/lib/dsp-negotiation-http-api-lib/build.gradle.kts b/data-protocols/dsp/dsp-negotiation/lib/dsp-negotiation-http-api-lib/build.gradle.kts index 6437cba347a..7f0c369e6e4 100644 --- a/data-protocols/dsp/dsp-negotiation/lib/dsp-negotiation-http-api-lib/build.gradle.kts +++ b/data-protocols/dsp/dsp-negotiation/lib/dsp-negotiation-http-api-lib/build.gradle.kts @@ -25,7 +25,4 @@ dependencies { testFixturesImplementation(project(":core:common:junit")) testFixturesImplementation(testFixtures(project(":extensions:common:http:jersey-core"))) testFixturesImplementation(libs.restAssured) - testFixturesImplementation(libs.assertj) - testFixturesImplementation(libs.mockito.core) - testFixturesImplementation(libs.junit.jupiter.params) -} \ No newline at end of file +} diff --git a/data-protocols/dsp/dsp-transfer-process/lib/dsp-transfer-process-http-api-lib/build.gradle.kts b/data-protocols/dsp/dsp-transfer-process/lib/dsp-transfer-process-http-api-lib/build.gradle.kts index d15718acfee..7581e71beaa 100644 --- a/data-protocols/dsp/dsp-transfer-process/lib/dsp-transfer-process-http-api-lib/build.gradle.kts +++ b/data-protocols/dsp/dsp-transfer-process/lib/dsp-transfer-process-http-api-lib/build.gradle.kts @@ -25,7 +25,4 @@ dependencies { testFixturesImplementation(project(":core:common:junit")) testFixturesImplementation(testFixtures(project(":extensions:common:http:jersey-core"))) testFixturesImplementation(libs.restAssured) - testFixturesImplementation(libs.assertj) - testFixturesImplementation(libs.mockito.core) - testFixturesImplementation(libs.junit.jupiter.params) -} \ No newline at end of file +} diff --git a/extensions/common/http/jersey-core/build.gradle.kts b/extensions/common/http/jersey-core/build.gradle.kts index 030d92fd04e..1a418067ad1 100644 --- a/extensions/common/http/jersey-core/build.gradle.kts +++ b/extensions/common/http/jersey-core/build.gradle.kts @@ -37,8 +37,6 @@ dependencies { testFixturesImplementation(project(":extensions:common:http:lib:jersey-providers-lib")) testFixturesApi(libs.jakarta.rsApi) testFixturesApi(libs.jackson.datatype.jakarta.jsonp) - testFixturesApi(libs.junit.jupiter.api) - testFixturesApi(libs.mockito.core) } diff --git a/extensions/common/sql/sql-bootstrapper/build.gradle.kts b/extensions/common/sql/sql-bootstrapper/build.gradle.kts index 7bf1b80a19e..66eef151a94 100644 --- a/extensions/common/sql/sql-bootstrapper/build.gradle.kts +++ b/extensions/common/sql/sql-bootstrapper/build.gradle.kts @@ -23,9 +23,8 @@ dependencies { api(project(":spi:common:transaction-spi")) implementation(project(":spi:common:transaction-datasource-spi")) implementation(project(":core:common:lib:sql-lib")) -// + testImplementation(project(":core:common:junit")) - testImplementation(libs.assertj) } diff --git a/extensions/common/sql/sql-lease/build.gradle.kts b/extensions/common/sql/sql-lease/build.gradle.kts index b467745109c..aa1a7493242 100644 --- a/extensions/common/sql/sql-lease/build.gradle.kts +++ b/extensions/common/sql/sql-lease/build.gradle.kts @@ -28,7 +28,6 @@ dependencies { testImplementation(project(":extensions:common:transaction:transaction-local")) testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures"))) testImplementation(libs.postgres) - testImplementation(libs.assertj) testFixturesImplementation(project(":core:common:lib:sql-lib")) // TODO: these fixtures could finish in sql-testfixtures module } diff --git a/extensions/common/sql/sql-test-fixtures/build.gradle.kts b/extensions/common/sql/sql-test-fixtures/build.gradle.kts index 2cf9c945aff..e5bb2457f13 100644 --- a/extensions/common/sql/sql-test-fixtures/build.gradle.kts +++ b/extensions/common/sql/sql-test-fixtures/build.gradle.kts @@ -25,8 +25,6 @@ dependencies { testFixturesImplementation(project(":core:common:lib:sql-lib")) testFixturesImplementation(project(":extensions:common:sql:sql-lease")) - testFixturesImplementation(libs.junit.jupiter.api) - testFixturesImplementation(libs.mockito.core) testFixturesImplementation(libs.postgres) testFixturesImplementation(libs.testcontainers.junit) testFixturesImplementation(libs.testcontainers.postgres) diff --git a/extensions/control-plane/api/management-api/management-api-test-fixtures/build.gradle.kts b/extensions/control-plane/api/management-api/management-api-test-fixtures/build.gradle.kts index c79a6d25672..9562e3f17b7 100644 --- a/extensions/control-plane/api/management-api/management-api-test-fixtures/build.gradle.kts +++ b/extensions/control-plane/api/management-api/management-api-test-fixtures/build.gradle.kts @@ -25,10 +25,6 @@ dependencies { testFixturesApi(project(":core:common:lib:util-lib")) testFixturesApi(project(":core:common:lib:json-ld-lib")) - testFixturesApi(libs.junit.jupiter.api) - - testFixturesImplementation(libs.assertj) testFixturesImplementation(libs.restAssured) testFixturesImplementation(libs.awaitility) - testFixturesImplementation(libs.mockito.core) } diff --git a/extensions/control-plane/store/sql/asset-index-sql/build.gradle.kts b/extensions/control-plane/store/sql/asset-index-sql/build.gradle.kts index 1730aa23ab4..b5d96ff5a40 100644 --- a/extensions/control-plane/store/sql/asset-index-sql/build.gradle.kts +++ b/extensions/control-plane/store/sql/asset-index-sql/build.gradle.kts @@ -30,7 +30,6 @@ dependencies { testImplementation(project(":core:common:junit")) testImplementation(project(":spi:common:policy-model")) - testImplementation(libs.assertj) testImplementation(testFixtures(project(":spi:control-plane:asset-spi"))) testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures"))) testImplementation(libs.postgres) diff --git a/extensions/control-plane/store/sql/contract-definition-store-sql/build.gradle.kts b/extensions/control-plane/store/sql/contract-definition-store-sql/build.gradle.kts index 8b359e625be..17f331a4629 100644 --- a/extensions/control-plane/store/sql/contract-definition-store-sql/build.gradle.kts +++ b/extensions/control-plane/store/sql/contract-definition-store-sql/build.gradle.kts @@ -27,7 +27,6 @@ dependencies { testImplementation(project(":core:common:junit")) testImplementation(project(":spi:common:policy-model")) - testImplementation(libs.assertj) testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures"))) testImplementation(testFixtures(project(":spi:control-plane:contract-spi"))) testImplementation(libs.postgres) diff --git a/extensions/control-plane/store/sql/contract-negotiation-store-sql/build.gradle.kts b/extensions/control-plane/store/sql/contract-negotiation-store-sql/build.gradle.kts index 382b8371b86..063353aeabf 100644 --- a/extensions/control-plane/store/sql/contract-negotiation-store-sql/build.gradle.kts +++ b/extensions/control-plane/store/sql/contract-negotiation-store-sql/build.gradle.kts @@ -28,7 +28,6 @@ dependencies { testImplementation(project(":core:common:junit")) - testImplementation(libs.assertj) testImplementation(testFixtures(project(":spi:control-plane:contract-spi"))) testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures"))) testImplementation(libs.postgres) diff --git a/extensions/control-plane/store/sql/transfer-process-store-sql/build.gradle.kts b/extensions/control-plane/store/sql/transfer-process-store-sql/build.gradle.kts index 04c5070e886..80fb98d9764 100644 --- a/extensions/control-plane/store/sql/transfer-process-store-sql/build.gradle.kts +++ b/extensions/control-plane/store/sql/transfer-process-store-sql/build.gradle.kts @@ -28,7 +28,6 @@ dependencies { implementation(project(":extensions:common:sql:sql-bootstrapper")) testImplementation(project(":core:common:junit")) - testImplementation(libs.assertj) testImplementation(libs.awaitility) testImplementation(libs.postgres) testImplementation(testFixtures(project(":spi:control-plane:transfer-spi"))) diff --git a/extensions/data-plane/data-plane-integration-tests/build.gradle.kts b/extensions/data-plane/data-plane-integration-tests/build.gradle.kts index dcd996242e2..3491aacd436 100644 --- a/extensions/data-plane/data-plane-integration-tests/build.gradle.kts +++ b/extensions/data-plane/data-plane-integration-tests/build.gradle.kts @@ -17,9 +17,7 @@ plugins { } dependencies { - testImplementation(libs.bundles.jupiter) testImplementation(libs.restAssured) - testImplementation(libs.assertj) testImplementation(libs.awaitility) testImplementation(libs.mockserver.netty) testImplementation(libs.mockserver.client) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fc8f752085b..333a36aac54 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -71,8 +71,6 @@ jetbrains-annotations = { module = "org.jetbrains:annotations", version.ref = "j jetty-jakarta-servlet-api = { module = "org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api", version.ref = "jetty-jakarta-servlet-api" } jetty-websocket = { module = "org.eclipse.jetty.websocket:websocket-jakarta-server", version.ref = "jetty" } junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "jupiter" } -junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "jupiter" } -junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "jupiter" } junit-pioneer = { module = "org.junit-pioneer:junit-pioneer", version.ref = "junit-pioneer" } micrometer = { module = "io.micrometer:micrometer-core", version.ref = "micrometer" } mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" } @@ -106,9 +104,8 @@ jsonschema = { module = "com.networknt:json-schema-validator", version = "1.5.6" [bundles] -jackson = ["jackson.annotations", "jackson.databind"] -jersey-core = ["jersey.server", "jersey.common", "jersey.jackson", "jersey.multipart", "jersey.inject", "jersey.servlet", "jersey.servletcore"] -jupiter = ["junit-jupiter-api", "junit-jupiter-params"] +jackson = ["jackson-annotations", "jackson-databind"] +jersey-core = ["jersey-server", "jersey-common", "jersey-jackson", "jersey-multipart", "jersey-inject", "jersey-servlet", "jersey-servletcore"] [plugins] shadow = { id = "com.gradleup.shadow", version = "8.3.6" } diff --git a/spi/common/core-spi/build.gradle.kts b/spi/common/core-spi/build.gradle.kts index 5542aa1e9be..f9dded8695c 100644 --- a/spi/common/core-spi/build.gradle.kts +++ b/spi/common/core-spi/build.gradle.kts @@ -27,11 +27,6 @@ dependencies { testImplementation(project(":tests:junit-base")) testImplementation(project(":core:common:lib:json-lib")) - - testFixturesImplementation(libs.bundles.jupiter) - testFixturesImplementation(libs.mockito.core) - testFixturesImplementation(libs.assertj) - testFixturesRuntimeOnly(libs.junit.jupiter.engine) } diff --git a/spi/common/edr-store-spi/build.gradle.kts b/spi/common/edr-store-spi/build.gradle.kts index 9632a74d470..35917eceeb2 100644 --- a/spi/common/edr-store-spi/build.gradle.kts +++ b/spi/common/edr-store-spi/build.gradle.kts @@ -20,12 +20,7 @@ plugins { dependencies { api(project(":spi:common:core-spi")) - // needed by the abstract test spec located in testFixtures - testFixturesImplementation(libs.bundles.jupiter) - testFixturesImplementation(libs.mockito.core) - testFixturesImplementation(libs.assertj) testFixturesImplementation(project(":core:common:junit")) - testFixturesRuntimeOnly(libs.junit.jupiter.engine) } diff --git a/spi/common/jwt-spi/build.gradle.kts b/spi/common/jwt-spi/build.gradle.kts index 75e5d3aaafe..53505b8dfe0 100644 --- a/spi/common/jwt-spi/build.gradle.kts +++ b/spi/common/jwt-spi/build.gradle.kts @@ -21,8 +21,6 @@ plugins { dependencies { implementation(libs.edc.runtime.metamodel) api(project(":spi:common:core-spi")) - testFixturesImplementation(libs.bundles.jupiter) - testFixturesImplementation(libs.assertj) testFixturesImplementation(project(":tests:junit-base")) } diff --git a/spi/control-plane/asset-spi/build.gradle.kts b/spi/control-plane/asset-spi/build.gradle.kts index ee1048b1dd8..1e975915665 100644 --- a/spi/control-plane/asset-spi/build.gradle.kts +++ b/spi/control-plane/asset-spi/build.gradle.kts @@ -23,12 +23,6 @@ dependencies { testImplementation(project(":tests:junit-base")) testImplementation(project(":core:common:lib:json-lib")) - - // needed by the abstract test spec located in testFixtures - testFixturesImplementation(libs.bundles.jupiter) - testFixturesImplementation(libs.mockito.core) - testFixturesImplementation(libs.assertj) - testFixturesRuntimeOnly(libs.junit.jupiter.engine) } diff --git a/spi/control-plane/contract-spi/build.gradle.kts b/spi/control-plane/contract-spi/build.gradle.kts index fb0879f87f9..9399077bb43 100644 --- a/spi/control-plane/contract-spi/build.gradle.kts +++ b/spi/control-plane/contract-spi/build.gradle.kts @@ -27,13 +27,8 @@ dependencies { testImplementation(project(":tests:junit-base")) testImplementation(project(":core:common:lib:json-lib")) - // needed by the abstract test spec located in testFixtures testFixturesImplementation(project(":spi:control-plane:asset-spi")) - testFixturesImplementation(libs.bundles.jupiter) - testFixturesImplementation(libs.mockito.core) - testFixturesImplementation(libs.assertj) testFixturesImplementation(project(":core:common:junit")) - testFixturesRuntimeOnly(libs.junit.jupiter.engine) } diff --git a/spi/control-plane/policy-spi/build.gradle.kts b/spi/control-plane/policy-spi/build.gradle.kts index cbb2249dae5..2cce77058e5 100644 --- a/spi/control-plane/policy-spi/build.gradle.kts +++ b/spi/control-plane/policy-spi/build.gradle.kts @@ -22,9 +22,6 @@ dependencies { api(project(":spi:common:core-spi")) testImplementation(project(":core:common:lib:json-lib")) - - testFixturesImplementation(libs.bundles.jupiter) - testFixturesImplementation(libs.assertj) } diff --git a/spi/control-plane/transfer-spi/build.gradle.kts b/spi/control-plane/transfer-spi/build.gradle.kts index 7965c46543f..d2151499b52 100644 --- a/spi/control-plane/transfer-spi/build.gradle.kts +++ b/spi/control-plane/transfer-spi/build.gradle.kts @@ -28,8 +28,6 @@ dependencies { testImplementation(project(":core:common:lib:json-lib")) testFixturesImplementation(project(":core:common:junit")) - testFixturesImplementation(libs.bundles.jupiter) - testFixturesImplementation(libs.assertj) testFixturesImplementation(libs.awaitility) } diff --git a/spi/data-plane-selector/data-plane-selector-spi/build.gradle.kts b/spi/data-plane-selector/data-plane-selector-spi/build.gradle.kts index 263785ce397..60482e9b545 100644 --- a/spi/data-plane-selector/data-plane-selector-spi/build.gradle.kts +++ b/spi/data-plane-selector/data-plane-selector-spi/build.gradle.kts @@ -25,11 +25,7 @@ dependencies { testImplementation(project(":core:common:lib:json-lib")) testFixturesImplementation(testFixtures(project(":core:common:junit"))) - testFixturesImplementation(libs.bundles.jupiter) - testFixturesImplementation(libs.mockito.core) - testFixturesImplementation(libs.assertj) testFixturesImplementation(libs.awaitility) - testFixturesRuntimeOnly(libs.junit.jupiter.engine) } diff --git a/spi/data-plane/data-plane-http-spi/build.gradle.kts b/spi/data-plane/data-plane-http-spi/build.gradle.kts index 1bbcbf30957..f4dbc4717c5 100644 --- a/spi/data-plane/data-plane-http-spi/build.gradle.kts +++ b/spi/data-plane/data-plane-http-spi/build.gradle.kts @@ -20,9 +20,6 @@ plugins { dependencies { api(project(":spi:common:core-spi")) api(project(":spi:common:data-address:data-address-http-data-spi")) - - testFixturesImplementation(libs.bundles.jupiter) - testFixturesImplementation(libs.assertj) } diff --git a/spi/data-plane/data-plane-spi/build.gradle.kts b/spi/data-plane/data-plane-spi/build.gradle.kts index 2b2fed3bf0b..8fb970f1364 100644 --- a/spi/data-plane/data-plane-spi/build.gradle.kts +++ b/spi/data-plane/data-plane-spi/build.gradle.kts @@ -21,8 +21,6 @@ dependencies { api(project(":spi:common:core-spi")) testFixturesApi(project(":core:common:junit")) - testFixturesImplementation(libs.bundles.jupiter) - testFixturesImplementation(libs.assertj) testFixturesImplementation(libs.awaitility) } diff --git a/spi/policy-monitor/policy-monitor-spi/build.gradle.kts b/spi/policy-monitor/policy-monitor-spi/build.gradle.kts index 2d34211bcdb..ece1c59e2b0 100644 --- a/spi/policy-monitor/policy-monitor-spi/build.gradle.kts +++ b/spi/policy-monitor/policy-monitor-spi/build.gradle.kts @@ -23,8 +23,6 @@ dependencies { api(project(":spi:control-plane:contract-spi")) testFixturesApi(project(":core:common:junit")) - testFixturesImplementation(libs.bundles.jupiter) - testFixturesImplementation(libs.assertj) testFixturesImplementation(libs.awaitility) } diff --git a/system-tests/bom-tests/build.gradle.kts b/system-tests/bom-tests/build.gradle.kts index 85d8068b72f..66a2d14c2a5 100644 --- a/system-tests/bom-tests/build.gradle.kts +++ b/system-tests/bom-tests/build.gradle.kts @@ -20,7 +20,6 @@ dependencies { testImplementation(project(":core:common:junit")) testImplementation(project(":core:common:lib:boot-lib")) testImplementation(libs.restAssured) - testImplementation(libs.assertj) testImplementation(libs.awaitility) testImplementation(libs.mockserver.netty) testImplementation(libs.mockserver.client) diff --git a/system-tests/dsp-compatibility-tests/compatibility-test-runner/build.gradle.kts b/system-tests/dsp-compatibility-tests/compatibility-test-runner/build.gradle.kts index a8c5ac21790..23aecfb9b86 100644 --- a/system-tests/dsp-compatibility-tests/compatibility-test-runner/build.gradle.kts +++ b/system-tests/dsp-compatibility-tests/compatibility-test-runner/build.gradle.kts @@ -18,7 +18,6 @@ plugins { dependencies { testImplementation(project(":core:common:junit")) - testImplementation(libs.assertj) testImplementation(libs.awaitility) testImplementation(libs.testcontainers.junit) runtimeOnly(libs.parsson) diff --git a/system-tests/e2e-dataplane-tests/tests/build.gradle.kts b/system-tests/e2e-dataplane-tests/tests/build.gradle.kts index 94223ccba0f..aea8710ad9b 100644 --- a/system-tests/e2e-dataplane-tests/tests/build.gradle.kts +++ b/system-tests/e2e-dataplane-tests/tests/build.gradle.kts @@ -28,9 +28,7 @@ dependencies { testImplementation(testFixtures(project(":extensions:control-plane:api:management-api:management-api-test-fixtures"))) testImplementation(libs.restAssured) - testImplementation(libs.assertj) testImplementation(libs.awaitility) - testImplementation(libs.junit.jupiter.api) testImplementation(libs.mockserver.netty) testImplementation(libs.mockserver.client) testImplementation(libs.testcontainers.postgres) diff --git a/system-tests/e2e-transfer-test/runner/build.gradle.kts b/system-tests/e2e-transfer-test/runner/build.gradle.kts index 12ea36f2075..ae9e6f01405 100644 --- a/system-tests/e2e-transfer-test/runner/build.gradle.kts +++ b/system-tests/e2e-transfer-test/runner/build.gradle.kts @@ -32,9 +32,7 @@ dependencies { testImplementation(libs.postgres) testImplementation(libs.restAssured) - testImplementation(libs.assertj) testImplementation(libs.awaitility) - testImplementation(libs.junit.jupiter.api) testImplementation(libs.mockserver.netty) testImplementation(libs.mockserver.client) testImplementation(libs.kafkaClients) diff --git a/system-tests/management-api/management-api-test-runner/build.gradle.kts b/system-tests/management-api/management-api-test-runner/build.gradle.kts index d79d20fc246..d838377740a 100644 --- a/system-tests/management-api/management-api-test-runner/build.gradle.kts +++ b/system-tests/management-api/management-api-test-runner/build.gradle.kts @@ -35,9 +35,7 @@ dependencies { testImplementation(project(":extensions:common:json-ld")) testImplementation(libs.restAssured) - testImplementation(libs.assertj) testImplementation(libs.awaitility) - testImplementation(libs.junit.jupiter.api) testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures"))) testImplementation(project(":extensions:common:transaction:transaction-local")) testImplementation(libs.testcontainers.junit) diff --git a/system-tests/telemetry/telemetry-test-runner/build.gradle.kts b/system-tests/telemetry/telemetry-test-runner/build.gradle.kts index c4a369b5482..d63de31454d 100644 --- a/system-tests/telemetry/telemetry-test-runner/build.gradle.kts +++ b/system-tests/telemetry/telemetry-test-runner/build.gradle.kts @@ -24,9 +24,7 @@ dependencies { testImplementation(project(":core:common:connector-core")) testImplementation(libs.restAssured) - testImplementation(libs.assertj) testImplementation(libs.awaitility) - testImplementation(libs.junit.jupiter.api) testImplementation(libs.mockserver.netty) testImplementation(libs.mockserver.client) testImplementation(libs.opentelemetry.proto) diff --git a/system-tests/version-api/version-api-test-runner/build.gradle.kts b/system-tests/version-api/version-api-test-runner/build.gradle.kts index ec1140a848d..8824151c5f4 100644 --- a/system-tests/version-api/version-api-test-runner/build.gradle.kts +++ b/system-tests/version-api/version-api-test-runner/build.gradle.kts @@ -36,9 +36,7 @@ dependencies { testImplementation(project(":extensions:common:json-ld")) testImplementation(libs.restAssured) - testImplementation(libs.assertj) testImplementation(libs.awaitility) - testImplementation(libs.junit.jupiter.api) testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures"))) testImplementation(project(":extensions:common:transaction:transaction-local")) testImplementation(libs.testcontainers.junit) diff --git a/tests/junit-base/build.gradle.kts b/tests/junit-base/build.gradle.kts index 416d3e7337d..4ce71f3d365 100644 --- a/tests/junit-base/build.gradle.kts +++ b/tests/junit-base/build.gradle.kts @@ -19,11 +19,9 @@ plugins { } dependencies { - api(project(":spi:common:boot-spi")) implementation(libs.assertj) - implementation(libs.junit.jupiter.api) implementation(libs.testcontainers.junit) } diff --git a/tests/junit-base/src/main/java/org/eclipse/edc/junit/testfixtures/TestUtils.java b/tests/junit-base/src/main/java/org/eclipse/edc/junit/testfixtures/TestUtils.java index 0d8852372d0..e5b41eef6d1 100644 --- a/tests/junit-base/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,8 +14,6 @@ package org.eclipse.edc.junit.testfixtures; -import org.opentest4j.AssertionFailedError; - import java.io.File; import java.io.IOException; import java.net.URI; @@ -37,12 +35,12 @@ public class TestUtils { public static URI getResource(String name) { var resource = Thread.currentThread().getContextClassLoader().getResource(name); if (resource == null) { - throw new AssertionFailedError("Cannot find resource " + name); + throw new AssertionError("Cannot find resource " + name); } try { return resource.toURI(); } catch (URISyntaxException e) { - throw new AssertionFailedError("Cannot find resource " + name, e); + throw new AssertionError("Cannot find resource " + name, e); } }