Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: cleanup test dependencies #4858

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: cleanup test dependencies #4858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion core/common/boot/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ dependencies {
implementation(project(":core:common:lib:boot-lib"))

implementation(libs.opentelemetry.api)
testImplementation(libs.junit.jupiter.api)
}


1 change: 0 additions & 1 deletion core/common/connector-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ dependencies {

testImplementation(project(":core:common:junit"))
testImplementation(libs.awaitility)
testImplementation(libs.junit.jupiter.api)
testImplementation(libs.mockserver.netty)
}

Expand Down
3 changes: 0 additions & 3 deletions core/common/junit/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))

Expand Down
2 changes: 0 additions & 2 deletions core/common/lib/http-lib/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}


4 changes: 1 addition & 3 deletions data-protocols/dsp/dsp-catalog/lib/dsp-catalog-http-api-lib/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
2 changes: 0 additions & 2 deletions data-protocols/dsp/dsp-http-spi/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,4 @@ dependencies {

testFixturesApi(project(":core:common:junit"))
testFixturesApi(project(":spi:common:json-ld-spi"))
testFixturesImplementation(libs.mockito.core)
testFixturesImplementation(libs.assertj)
}
5 changes: 1 addition & 4 deletions data-protocols/dsp/dsp-negotiation/lib/dsp-negotiation-http-api-lib/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
5 changes: 1 addition & 4 deletions ...protocols/dsp/dsp-transfer-process/lib/dsp-transfer-process-http-api-lib/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
2 changes: 0 additions & 2 deletions extensions/common/http/jersey-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}


3 changes: 1 addition & 2 deletions extensions/common/sql/sql-bootstrapper/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}


1 change: 0 additions & 1 deletion extensions/common/sql/sql-lease/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 0 additions & 2 deletions extensions/common/sql/sql-test-fixtures/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 0 additions & 4 deletions extensions/control-plane/api/management-api/management-api-test-fixtures/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
1 change: 0 additions & 1 deletion extensions/control-plane/store/sql/asset-index-sql/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion extensions/control-plane/store/sql/contract-definition-store-sql/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion extensions/control-plane/store/sql/contract-negotiation-store-sql/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion extensions/control-plane/store/sql/transfer-process-store-sql/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")))
Expand Down
2 changes: 0 additions & 2 deletions extensions/data-plane/data-plane-integration-tests/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 2 additions & 5 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down Expand Up @@ -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" }
Expand Down
5 changes: 0 additions & 5 deletions spi/common/core-spi/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}


5 changes: 0 additions & 5 deletions spi/common/edr-store-spi/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}


2 changes: 0 additions & 2 deletions spi/common/jwt-spi/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}

Expand Down
6 changes: 0 additions & 6 deletions spi/control-plane/asset-spi/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}


5 changes: 0 additions & 5 deletions spi/control-plane/contract-spi/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}


3 changes: 0 additions & 3 deletions spi/control-plane/policy-spi/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}


2 changes: 0 additions & 2 deletions spi/control-plane/transfer-spi/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
4 changes: 0 additions & 4 deletions spi/data-plane-selector/data-plane-selector-spi/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}


Expand Down
3 changes: 0 additions & 3 deletions spi/data-plane/data-plane-http-spi/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}


2 changes: 0 additions & 2 deletions spi/data-plane/data-plane-spi/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
2 changes: 0 additions & 2 deletions spi/policy-monitor/policy-monitor-spi/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
1 change: 0 additions & 1 deletion system-tests/bom-tests/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion system-tests/dsp-compatibility-tests/compatibility-test-runner/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ plugins {

dependencies {
testImplementation(project(":core:common:junit"))
testImplementation(libs.assertj)
testImplementation(libs.awaitility)
testImplementation(libs.testcontainers.junit)
runtimeOnly(libs.parsson)
Expand Down
2 changes: 0 additions & 2 deletions system-tests/e2e-dataplane-tests/tests/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions system-tests/e2e-transfer-test/runner/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions system-tests/management-api/management-api-test-runner/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions system-tests/telemetry/telemetry-test-runner/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions system-tests/version-api/version-api-test-runner/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions tests/junit-base/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,9 @@ plugins {
}

dependencies {

api(project(":spi:common:boot-spi"))

implementation(libs.assertj)
implementation(libs.junit.jupiter.api)
implementation(libs.testcontainers.junit)
}

Expand Down
Loading