diff --git a/DEPENDENCIES b/DEPENDENCIES index 416043500..3e4a024fb 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -47,7 +47,7 @@ maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.17.1, Apache-2. maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.17.2, Apache-2.0, approved, #13671 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.18.0, Apache-2.0, approved, #16372 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-toml/2.15.2, Apache-2.0, approved, #15241 -maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-toml/2.18.0, , restricted, clearlydefined +maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-toml/2.18.0, Apache-2.0, approved, #16800 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.14.0, Apache-2.0, approved, #5933 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.16.2, Apache-2.0, approved, #11855 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.18.0, Apache-2.0, approved, #16370 @@ -324,7 +324,6 @@ maven/mavencentral/org.bouncycastle/bcpkix-jdk18on/1.72, MIT, approved, #3789 maven/mavencentral/org.bouncycastle/bcpkix-jdk18on/1.78.1, MIT, approved, #14434 maven/mavencentral/org.bouncycastle/bcprov-jdk18on/1.72, MIT AND CC0-1.0, approved, #3538 maven/mavencentral/org.bouncycastle/bcprov-jdk18on/1.78.1, MIT AND CC0-1.0, approved, #14433 -maven/mavencentral/org.bouncycastle/bcutil-jdk18on/1.72, MIT, approved, #3790 maven/mavencentral/org.bouncycastle/bcutil-jdk18on/1.78.1, MIT, approved, #14435 maven/mavencentral/org.ccil.cowan.tagsoup/tagsoup/1.2.1, Apache-2.0, approved, clearlydefined maven/mavencentral/org.checkerframework/checker-qual/3.12.0, MIT, approved, clearlydefined diff --git a/edc-tests/edc-controlplane/fixtures/build.gradle.kts b/edc-tests/e2e-fixtures/build.gradle.kts similarity index 56% rename from edc-tests/edc-controlplane/fixtures/build.gradle.kts rename to edc-tests/e2e-fixtures/build.gradle.kts index a8ce8a66d..4b2937c42 100644 --- a/edc-tests/edc-controlplane/fixtures/build.gradle.kts +++ b/edc-tests/e2e-fixtures/build.gradle.kts @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. @@ -23,42 +23,40 @@ plugins { } dependencies { - // api modules that the test classes may need - testFixturesApi(project(":spi:edr-spi")) - testFixturesApi(project(":edc-extensions:edr:edr-api-v2")) - testFixturesApi(project(":spi:core-spi")) - testFixturesApi(project(":spi:tokenrefresh-spi")) testFixturesApi(project(":spi:bdrs-client-spi")) + testFixturesApi(project(":spi:core-spi")) + testFixturesApi(project(":spi:edr-spi")) + testFixturesApi(project(":edc-extensions:agreements:retirement-evaluation-spi")) + testFixturesApi(project(":edc-extensions:bpn-validation:bpn-validation-spi")) - testFixturesApi(libs.edc.spi.core) + + testFixturesApi(libs.edc.core.token) + testFixturesApi(libs.edc.identity.trust.sts.embedded) + testFixturesApi(libs.edc.junit) + testFixturesApi(libs.edc.lib.cryptocommon) + testFixturesApi(libs.edc.lib.jws2020) + testFixturesApi(libs.edc.lib.util) + testFixturesApi(libs.edc.aws.s3.core) + testFixturesApi(libs.edc.spi.edrstore) + testFixturesApi(libs.edc.spi.jsonld) testFixturesApi(libs.edc.spi.policy) - testFixturesApi(libs.edc.spi.contract) + testFixturesApi(libs.edc.spi.transfer) testFixturesApi(testFixtures(libs.edc.api.management.test.fixtures)) - testFixturesApi(libs.edc.spi.edrstore) - testFixturesApi(libs.edc.lib.cryptocommon) - testFixturesApi(libs.edc.lib.boot) - // api modules for some test utils + testFixturesApi(libs.assertj) + testFixturesApi(libs.awaitility) + testFixturesApi(libs.aws.s3) + testFixturesApi(libs.azure.storage.blob) + testFixturesApi(libs.jakartaJson) + testFixturesApi(libs.junit.jupiter.api) + testFixturesApi(libs.junit.jupiter.params) testFixturesApi(libs.netty.mockserver) - testFixturesApi(libs.edc.junit) + testFixturesApi(libs.postgres) testFixturesApi(libs.restAssured) - testFixturesApi(libs.awaitility) - - testFixturesImplementation(libs.edc.identity.trust.sts.embedded) - testFixturesImplementation(libs.edc.core.token) - testFixturesImplementation(libs.edc.spi.identity.did) - testFixturesImplementation(libs.postgres) - testFixturesImplementation(libs.testcontainers.postgres) - testFixturesImplementation(libs.assertj) - testFixturesImplementation(libs.junit.jupiter.api) - testFixturesImplementation(project(":edc-extensions:bpn-validation:bpn-validation-spi")) - testFixturesImplementation(project(":edc-extensions:agreements:retirement-evaluation-spi")) - - testCompileOnly(project(":edc-tests:runtime:runtime-memory")) - testCompileOnly(project(":edc-tests:runtime:runtime-postgresql")) + testFixturesApi(libs.testcontainers.junit) + testFixturesApi(libs.testcontainers.postgres) } -// do not publish edcBuild { publish.set(false) } diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/IdentityParticipant.java b/edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/IdentityParticipant.java similarity index 100% rename from edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/IdentityParticipant.java rename to edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/IdentityParticipant.java diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/MockBpnIdentityService.java b/edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/MockBpnIdentityService.java similarity index 100% rename from edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/MockBpnIdentityService.java rename to edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/MockBpnIdentityService.java diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/ParticipantAwareTest.java b/edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/ParticipantAwareTest.java similarity index 100% rename from edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/ParticipantAwareTest.java rename to edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/ParticipantAwareTest.java diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/ParticipantConsumerDataPlaneApi.java b/edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/ParticipantConsumerDataPlaneApi.java similarity index 100% rename from edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/ParticipantConsumerDataPlaneApi.java rename to edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/ParticipantConsumerDataPlaneApi.java diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/ParticipantDataApi.java b/edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/ParticipantDataApi.java similarity index 100% rename from edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/ParticipantDataApi.java rename to edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/ParticipantDataApi.java diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/ParticipantEdrApi.java b/edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/ParticipantEdrApi.java similarity index 100% rename from edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/ParticipantEdrApi.java rename to edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/ParticipantEdrApi.java diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/TestRuntimeConfiguration.java b/edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/TestRuntimeConfiguration.java similarity index 100% rename from edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/TestRuntimeConfiguration.java rename to edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/TestRuntimeConfiguration.java diff --git a/edc-tests/edc-end2end/end2end-transfer-cloud/src/test/java/org/eclipse/tractusx/edc/tests/transfer/MinioContainer.java b/edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/aws/MinioContainer.java similarity index 96% rename from edc-tests/edc-end2end/end2end-transfer-cloud/src/test/java/org/eclipse/tractusx/edc/tests/transfer/MinioContainer.java rename to edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/aws/MinioContainer.java index 329a69c4e..134c06ff4 100644 --- a/edc-tests/edc-end2end/end2end-transfer-cloud/src/test/java/org/eclipse/tractusx/edc/tests/transfer/MinioContainer.java +++ b/edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/aws/MinioContainer.java @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.eclipse.tractusx.edc.tests.transfer; +package org.eclipse.tractusx.edc.tests.aws; import org.testcontainers.containers.GenericContainer; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; diff --git a/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/AzureBlobHelper.java b/edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/azure/AzureBlobHelper.java similarity index 94% rename from edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/AzureBlobHelper.java rename to edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/azure/AzureBlobHelper.java index 5a7221c49..d07dc5625 100644 --- a/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/AzureBlobHelper.java +++ b/edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/azure/AzureBlobHelper.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + * Copyright (c) 2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. @@ -17,7 +17,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -package org.eclipse.tractusx.edc.dataplane.transfer.test; +package org.eclipse.tractusx.edc.tests.azure; import com.azure.core.util.BinaryData; import com.azure.storage.blob.BlobContainerClient; @@ -43,7 +43,7 @@ public class AzureBlobHelper { private final int port; private BlobServiceClient blobServiceClient; - public AzureBlobHelper(String accountName, String key, String host, int port) { + AzureBlobHelper(String accountName, String key, String host, int port) { this.accountName = accountName; this.key = key; this.host = host; @@ -54,25 +54,14 @@ public BlobContainerClient createContainer(String containerName) { return blobClient().createBlobContainer(containerName); } - private BlobServiceClient blobClient() { - if (blobServiceClient == null) { - var endpoint = "http://%s:%s/%s".formatted(host, port, accountName); - blobServiceClient = new BlobServiceClientBuilder() - .credential(new StorageSharedKeyCredential(accountName, key)) - .endpoint(endpoint) - .buildClient(); - } - return blobServiceClient; + public void uploadBlob(BlobContainerClient client, BinaryData data, String targetBlobName) { + client.getBlobClient(targetBlobName).upload(data, true); } - + public void uploadBlob(BlobContainerClient client, InputStream inputStream, String targetBlobName) { client.getBlobClient(targetBlobName).upload(inputStream, true); } - public void uploadBlob(BlobContainerClient client, BinaryData data, String targetBlobName) { - client.getBlobClient(targetBlobName).upload(data, true); - } - public List listBlobs(String container) { if (blobClient().listBlobContainers().stream().noneMatch(bci -> bci.getName().equalsIgnoreCase(container))) { return List.of(); @@ -84,6 +73,16 @@ public List listBlobs(String container) { .toList(); } + private BlobServiceClient blobClient() { + if (blobServiceClient == null) { + var endpoint = "http://%s:%s/%s".formatted(host, port, accountName); + blobServiceClient = new BlobServiceClientBuilder() + .credential(new StorageSharedKeyCredential(accountName, key)) + .endpoint(endpoint) + .buildClient(); + } + return blobServiceClient; + } public String generateAccountSas(String containerName) { var expiry = OffsetDateTime.MAX.minusDays(1); @@ -91,4 +90,5 @@ public String generateAccountSas(String containerName) { var vals = new BlobServiceSasSignatureValues(expiry, permissions); return blobClient().getBlobContainerClient(containerName).generateSas(vals); } + } diff --git a/edc-tests/edc-end2end/end2end-transfer-cloud/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AzuriteContainer.java b/edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/azure/AzuriteContainer.java similarity index 77% rename from edc-tests/edc-end2end/end2end-transfer-cloud/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AzuriteContainer.java rename to edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/azure/AzuriteContainer.java index 1d41c0413..53fbd6c2e 100644 --- a/edc-tests/edc-end2end/end2end-transfer-cloud/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AzuriteContainer.java +++ b/edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/azure/AzuriteContainer.java @@ -17,24 +17,23 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.eclipse.tractusx.edc.tests.transfer; +package org.eclipse.tractusx.edc.tests.azure; import org.testcontainers.containers.GenericContainer; -import java.util.Arrays; import java.util.List; +import static java.util.Arrays.stream; import static java.util.stream.Collectors.joining; -import static org.eclipse.tractusx.edc.tests.transfer.AzureToAzureEndToEndTest.AZURITE_DOCKER_IMAGE; public class AzuriteContainer extends GenericContainer { + private static final String IMAGE_NAME = "mcr.microsoft.com/azure-storage/azurite"; private final int containerPort = 10_000; public AzuriteContainer(int azuriteHostPort, Account... accounts) { - super(AZURITE_DOCKER_IMAGE); - var azuriteAccounts = Arrays.stream(accounts).map(it -> "%s:%s".formatted(it.name, it.key)).collect(joining(";")); - addEnv("AZURITE_ACCOUNTS", azuriteAccounts); + super(IMAGE_NAME); + addEnv("AZURITE_ACCOUNTS", stream(accounts).map(it -> "%s:%s".formatted(it.name, it.key)).collect(joining(";"))); setPortBindings(List.of("%d:%d".formatted(azuriteHostPort, containerPort))); } diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/helpers/CatalogHelperFunctions.java b/edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/helpers/CatalogHelperFunctions.java similarity index 100% rename from edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/helpers/CatalogHelperFunctions.java rename to edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/helpers/CatalogHelperFunctions.java diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/helpers/EdrNegotiationHelperFunctions.java b/edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/helpers/EdrNegotiationHelperFunctions.java similarity index 100% rename from edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/helpers/EdrNegotiationHelperFunctions.java rename to edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/helpers/EdrNegotiationHelperFunctions.java diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/helpers/Functions.java b/edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/helpers/Functions.java similarity index 100% rename from edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/helpers/Functions.java rename to edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/helpers/Functions.java diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/helpers/PolicyHelperFunctions.java b/edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/helpers/PolicyHelperFunctions.java similarity index 100% rename from edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/helpers/PolicyHelperFunctions.java rename to edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/helpers/PolicyHelperFunctions.java diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/helpers/QueryHelperFunctions.java b/edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/helpers/QueryHelperFunctions.java similarity index 100% rename from edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/helpers/QueryHelperFunctions.java rename to edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/helpers/QueryHelperFunctions.java diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/helpers/ReceivedEvent.java b/edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/helpers/ReceivedEvent.java similarity index 100% rename from edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/helpers/ReceivedEvent.java rename to edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/helpers/ReceivedEvent.java diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/participant/TractusxIatpParticipantBase.java b/edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/participant/TractusxIatpParticipantBase.java similarity index 100% rename from edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/participant/TractusxIatpParticipantBase.java rename to edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/participant/TractusxIatpParticipantBase.java diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/participant/TractusxParticipantBase.java b/edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/participant/TractusxParticipantBase.java similarity index 100% rename from edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/participant/TractusxParticipantBase.java rename to edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/participant/TractusxParticipantBase.java diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/participant/TransferParticipant.java b/edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/participant/TransferParticipant.java similarity index 100% rename from edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/participant/TransferParticipant.java rename to edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/participant/TransferParticipant.java diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/DataWiper.java b/edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/DataWiper.java similarity index 100% rename from edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/DataWiper.java rename to edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/DataWiper.java diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/KeyPool.java b/edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/KeyPool.java similarity index 100% rename from edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/KeyPool.java rename to edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/KeyPool.java diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/ParticipantRuntime.java b/edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/ParticipantRuntime.java similarity index 100% rename from edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/ParticipantRuntime.java rename to edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/ParticipantRuntime.java diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/ParticipantRuntimeExtension.java b/edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/ParticipantRuntimeExtension.java similarity index 100% rename from edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/ParticipantRuntimeExtension.java rename to edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/ParticipantRuntimeExtension.java diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/PostgresExtension.java b/edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/PostgresExtension.java similarity index 100% rename from edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/PostgresExtension.java rename to edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/PostgresExtension.java diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/Runtimes.java b/edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/Runtimes.java similarity index 100% rename from edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/Runtimes.java rename to edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/Runtimes.java diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/transfer/HttpConsumerPullBaseTest.java b/edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/transfer/HttpConsumerPullBaseTest.java similarity index 100% rename from edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/transfer/HttpConsumerPullBaseTest.java rename to edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/transfer/HttpConsumerPullBaseTest.java diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/transfer/ProviderPushBaseTest.java b/edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/transfer/ProviderPushBaseTest.java similarity index 94% rename from edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/transfer/ProviderPushBaseTest.java rename to edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/transfer/ProviderPushBaseTest.java index 6a4b1ef1a..741c328eb 100644 --- a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/transfer/ProviderPushBaseTest.java +++ b/edc-tests/e2e-fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/transfer/ProviderPushBaseTest.java @@ -80,7 +80,11 @@ void httpPushDataTransfer() { var destination = httpDataAddress(consumerUrl); - var transferProcessId = consumer().requestAsset(provider(), assetId, createObjectBuilder().build(), destination, "HttpData-PUSH"); + var transferProcessId = consumer() + .requestAssetFrom(assetId, provider()) + .withDestination(destination) + .withTransferType("HttpData-PUSH") + .execute(); await().atMost(ASYNC_TIMEOUT).untilAsserted(() -> { var state = consumer().getTransferProcessState(transferProcessId); assertThat(state).isEqualTo(COMPLETED.name()); diff --git a/edc-tests/edc-controlplane/agreement-retirement-tests/build.gradle.kts b/edc-tests/edc-controlplane/agreement-retirement-tests/build.gradle.kts index a577afd5b..14daf60ee 100644 --- a/edc-tests/edc-controlplane/agreement-retirement-tests/build.gradle.kts +++ b/edc-tests/edc-controlplane/agreement-retirement-tests/build.gradle.kts @@ -23,7 +23,7 @@ plugins { } dependencies { - testImplementation(testFixtures(project(":edc-tests:edc-controlplane:fixtures"))) + testImplementation(testFixtures(project(":edc-tests:e2e-fixtures"))) testImplementation(libs.netty.mockserver) testImplementation(libs.edc.junit) diff --git a/edc-tests/edc-controlplane/catalog-tests/build.gradle.kts b/edc-tests/edc-controlplane/catalog-tests/build.gradle.kts index 7b20e8d38..9a4a47aee 100644 --- a/edc-tests/edc-controlplane/catalog-tests/build.gradle.kts +++ b/edc-tests/edc-controlplane/catalog-tests/build.gradle.kts @@ -23,7 +23,7 @@ plugins { } dependencies { - testImplementation(testFixtures(project(":edc-tests:edc-controlplane:fixtures"))) + testImplementation(testFixtures(project(":edc-tests:e2e-fixtures"))) testImplementation(libs.netty.mockserver) testImplementation(libs.edc.junit) diff --git a/edc-tests/edc-controlplane/edr-api-tests/build.gradle.kts b/edc-tests/edc-controlplane/edr-api-tests/build.gradle.kts index d3d9d8ba4..71b5efaa4 100644 --- a/edc-tests/edc-controlplane/edr-api-tests/build.gradle.kts +++ b/edc-tests/edc-controlplane/edr-api-tests/build.gradle.kts @@ -23,7 +23,10 @@ plugins { } dependencies { - testImplementation(testFixtures(project(":edc-tests:edc-controlplane:fixtures"))) + testImplementation(project(":spi:tokenrefresh-spi")) + + testImplementation(testFixtures(project(":edc-tests:e2e-fixtures"))) + testImplementation(libs.edc.spi.edrstore) testImplementation(libs.netty.mockserver) testImplementation(libs.edc.junit) diff --git a/edc-tests/edc-controlplane/iatp-tests/build.gradle.kts b/edc-tests/edc-controlplane/iatp-tests/build.gradle.kts index a2e3f5c65..d3c00fc4e 100644 --- a/edc-tests/edc-controlplane/iatp-tests/build.gradle.kts +++ b/edc-tests/edc-controlplane/iatp-tests/build.gradle.kts @@ -23,7 +23,7 @@ plugins { } dependencies { - testImplementation(testFixtures(project(":edc-tests:edc-controlplane:fixtures"))) + testImplementation(testFixtures(project(":edc-tests:e2e-fixtures"))) testImplementation(libs.edc.identity.trust.sts.embedded) testImplementation(libs.edc.ih.did) testImplementation(libs.edc.ih.spi) diff --git a/edc-tests/edc-controlplane/policy-tests/build.gradle.kts b/edc-tests/edc-controlplane/policy-tests/build.gradle.kts index f8f1ae8b0..f015c19a5 100644 --- a/edc-tests/edc-controlplane/policy-tests/build.gradle.kts +++ b/edc-tests/edc-controlplane/policy-tests/build.gradle.kts @@ -23,7 +23,7 @@ plugins { } dependencies { - testImplementation(testFixtures(project(":edc-tests:edc-controlplane:fixtures"))) + testImplementation(testFixtures(project(":edc-tests:e2e-fixtures"))) testImplementation(libs.netty.mockserver) testImplementation(libs.edc.junit) diff --git a/edc-tests/edc-controlplane/transfer-tests/build.gradle.kts b/edc-tests/edc-controlplane/transfer-tests/build.gradle.kts index 7574ab320..20d05efb4 100644 --- a/edc-tests/edc-controlplane/transfer-tests/build.gradle.kts +++ b/edc-tests/edc-controlplane/transfer-tests/build.gradle.kts @@ -24,7 +24,7 @@ plugins { dependencies { testImplementation(project(":spi:bdrs-client-spi")) - testImplementation(testFixtures(project(":edc-tests:edc-controlplane:fixtures"))) + testImplementation(testFixtures(project(":edc-tests:e2e-fixtures"))) testImplementation(libs.netty.mockserver) testImplementation(libs.edc.junit) diff --git a/edc-tests/edc-dataplane/cloud-transfer-tests/build.gradle.kts b/edc-tests/edc-dataplane/cloud-transfer-tests/build.gradle.kts index 96843a113..ab130809f 100644 --- a/edc-tests/edc-dataplane/cloud-transfer-tests/build.gradle.kts +++ b/edc-tests/edc-dataplane/cloud-transfer-tests/build.gradle.kts @@ -24,6 +24,7 @@ plugins { } dependencies { + testImplementation(testFixtures(project(":edc-tests:e2e-fixtures"))) testImplementation(libs.edc.junit) testImplementation(libs.restAssured) diff --git a/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/AzureToAzureTest.java b/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/AzureToAzureTest.java index 2bffec3e3..2c86ab99a 100644 --- a/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/AzureToAzureTest.java +++ b/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/AzureToAzureTest.java @@ -31,6 +31,8 @@ import org.eclipse.edc.spi.monitor.ConsoleMonitor; import org.eclipse.edc.spi.monitor.Monitor; import org.eclipse.edc.spi.security.Vault; +import org.eclipse.tractusx.edc.tests.azure.AzureBlobHelper; +import org.eclipse.tractusx.edc.tests.azure.AzuriteContainer; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/AzuriteContainer.java b/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/AzuriteContainer.java deleted file mode 100644 index 1bc2e3b20..000000000 --- a/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/AzuriteContainer.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2024 Cofinity-X - * - * See the NOTICE file(s) distributed with this work for additional - * information regarding copyright ownership. - * - * 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. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -package org.eclipse.tractusx.edc.dataplane.transfer.test; - -import org.testcontainers.containers.GenericContainer; - -import java.util.Arrays; -import java.util.List; - -import static java.util.stream.Collectors.joining; -import static org.eclipse.tractusx.edc.dataplane.transfer.test.TestConstants.AZURITE_CONTAINER_PORT; - -public class AzuriteContainer extends GenericContainer { - - public AzuriteContainer(int azuriteHostPort, Account... accounts) { - super(TestConstants.AZURITE_DOCKER_IMAGE); - var azuriteAccounts = Arrays.stream(accounts).map(it -> "%s:%s".formatted(it.name, it.key)).collect(joining(";")); - addEnv("AZURITE_ACCOUNTS", azuriteAccounts); - setPortBindings(List.of("%d:10000".formatted(azuriteHostPort))); - } - - public AzureBlobHelper getHelper(Account account) { - return new AzureBlobHelper(account.name(), account.key(), getHost(), getMappedPort(AZURITE_CONTAINER_PORT)); - } - - public record Account(String name, String key) { } -} diff --git a/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/MinioContainer.java b/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/MinioContainer.java deleted file mode 100644 index eb235a255..000000000 --- a/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/MinioContainer.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - * - * See the NOTICE file(s) distributed with this work for additional - * information regarding copyright ownership. - * - * 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. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -package org.eclipse.tractusx.edc.dataplane.transfer.test; - -import org.testcontainers.containers.GenericContainer; -import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; - -import java.util.UUID; - -public class MinioContainer extends GenericContainer { - - private final String accessKeyId = "test-access-key"; - private final String secretAccessKey = UUID.randomUUID().toString(); - - public MinioContainer() { - super("bitnami/minio"); - addEnv("MINIO_ROOT_USER", accessKeyId); - addEnv("MINIO_ROOT_PASSWORD", secretAccessKey); - addExposedPort(9000); - } - - public AwsBasicCredentials getCredentials() { - return AwsBasicCredentials.create(accessKeyId, secretAccessKey); - } -} diff --git a/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/MultiCloudTest.java b/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/MultiCloudTest.java index e11ab57ca..6308c728d 100644 --- a/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/MultiCloudTest.java +++ b/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/MultiCloudTest.java @@ -33,6 +33,9 @@ import org.eclipse.edc.junit.extensions.RuntimePerClassExtension; import org.eclipse.edc.junit.testfixtures.TestUtils; import org.eclipse.edc.spi.security.Vault; +import org.eclipse.tractusx.edc.tests.aws.MinioContainer; +import org.eclipse.tractusx.edc.tests.azure.AzureBlobHelper; +import org.eclipse.tractusx.edc.tests.azure.AzuriteContainer; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/S3ToS3Test.java b/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/S3ToS3Test.java index 1fce1e270..f55161b46 100644 --- a/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/S3ToS3Test.java +++ b/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/S3ToS3Test.java @@ -34,6 +34,7 @@ import org.eclipse.edc.junit.testfixtures.TestUtils; import org.eclipse.edc.spi.monitor.ConsoleMonitor; import org.eclipse.edc.spi.monitor.Monitor; +import org.eclipse.tractusx.edc.tests.aws.MinioContainer; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/TestConstants.java b/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/TestConstants.java index 4899c12b1..ea148e9e8 100644 --- a/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/TestConstants.java +++ b/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/TestConstants.java @@ -21,6 +21,7 @@ import jakarta.json.Json; import jakarta.json.JsonObjectBuilder; +import org.eclipse.tractusx.edc.tests.azure.AzuriteContainer; import software.amazon.awssdk.regions.Region; import java.util.List; @@ -29,8 +30,6 @@ public class TestConstants { // AZURE BLOB CONSTANTS - public static final String AZURITE_DOCKER_IMAGE = "mcr.microsoft.com/azure-storage/azurite"; - public static final int AZURITE_CONTAINER_PORT = 10000; public static final AzuriteContainer.Account PROVIDER_AZURITE_ACCOUNT = new AzuriteContainer.Account("provider", "providerkey"); public static final AzuriteContainer.Account CONSUMER_AZURITE_ACCOUNT = new AzuriteContainer.Account("consumer", "consumerkey"); // alias under which the provider key is stored in the vault. must end with -key1 diff --git a/edc-tests/edc-end2end/end2end-transfer-cloud/build.gradle.kts b/edc-tests/edc-end2end/end2end-transfer-cloud/build.gradle.kts index 0f5f65a03..b2bdf3448 100644 --- a/edc-tests/edc-end2end/end2end-transfer-cloud/build.gradle.kts +++ b/edc-tests/edc-end2end/end2end-transfer-cloud/build.gradle.kts @@ -23,7 +23,7 @@ plugins { } dependencies { - testImplementation(testFixtures(project(":edc-tests:edc-controlplane:fixtures"))) + testImplementation(testFixtures(project(":edc-tests:e2e-fixtures"))) testImplementation(libs.edc.junit) testImplementation(libs.restAssured) @@ -33,7 +33,6 @@ dependencies { testImplementation(libs.edc.aws.s3.core) testImplementation(libs.aws.s3) testImplementation(libs.aws.s3transfer) - testImplementation(libs.azure.storage.blob) } // do not publish diff --git a/edc-tests/edc-end2end/end2end-transfer-cloud/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AzureBlobHelper.java b/edc-tests/edc-end2end/end2end-transfer-cloud/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AzureBlobHelper.java deleted file mode 100644 index 15a609098..000000000 --- a/edc-tests/edc-end2end/end2end-transfer-cloud/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AzureBlobHelper.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (c) 2024 Bayerische Motoren Werke Aktiengesellschaft - * - * See the NOTICE file(s) distributed with this work for additional - * information regarding copyright ownership. - * - * 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. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -package org.eclipse.tractusx.edc.tests.transfer; - -import com.azure.core.util.BinaryData; -import com.azure.storage.blob.BlobContainerClient; -import com.azure.storage.blob.BlobServiceClient; -import com.azure.storage.blob.BlobServiceClientBuilder; -import com.azure.storage.blob.models.BlobItem; -import com.azure.storage.common.StorageSharedKeyCredential; - -import java.util.List; - - -/** - * Helper class that internally uses Azure SDK classes to create containers, upload blobs, generate SAS tokens, etc. - */ -public class AzureBlobHelper { - private final String accountName; - private final String key; - private final String host; - private final int port; - private BlobServiceClient blobServiceClient; - - AzureBlobHelper(String accountName, String key, String host, int port) { - this.accountName = accountName; - this.key = key; - this.host = host; - this.port = port; - } - - public BlobContainerClient createContainer(String containerName) { - return blobClient().createBlobContainer(containerName); - } - - public void uploadBlob(BlobContainerClient client, BinaryData data, String targetBlobName) { - client.getBlobClient(targetBlobName).upload(data, true); - } - - public List listBlobs(String container) { - if (blobClient().listBlobContainers().stream().noneMatch(bci -> bci.getName().equalsIgnoreCase(container))) { - return List.of(); - } - return blobClient() - .getBlobContainerClient(container) - .listBlobs() - .stream().map(BlobItem::getName) - .toList(); - } - - private BlobServiceClient blobClient() { - if (blobServiceClient == null) { - var endpoint = "http://%s:%s/%s".formatted(host, port, accountName); - blobServiceClient = new BlobServiceClientBuilder() - .credential(new StorageSharedKeyCredential(accountName, key)) - .endpoint(endpoint) - .buildClient(); - } - return blobServiceClient; - } -} diff --git a/edc-tests/edc-end2end/end2end-transfer-cloud/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AzureToAzureEndToEndTest.java b/edc-tests/edc-end2end/end2end-transfer-cloud/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AzureToAzureEndToEndTest.java index 3b00ec544..b18776fce 100644 --- a/edc-tests/edc-end2end/end2end-transfer-cloud/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AzureToAzureEndToEndTest.java +++ b/edc-tests/edc-end2end/end2end-transfer-cloud/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AzureToAzureEndToEndTest.java @@ -25,6 +25,8 @@ import org.eclipse.edc.junit.extensions.RuntimeExtension; import org.eclipse.edc.junit.testfixtures.TestUtils; import org.eclipse.edc.spi.security.Vault; +import org.eclipse.tractusx.edc.tests.azure.AzureBlobHelper; +import org.eclipse.tractusx.edc.tests.azure.AzuriteContainer; import org.eclipse.tractusx.edc.tests.participant.TractusxParticipantBase; import org.eclipse.tractusx.edc.tests.participant.TransferParticipant; import org.junit.jupiter.api.BeforeEach; diff --git a/edc-tests/edc-end2end/end2end-transfer-cloud/src/test/java/org/eclipse/tractusx/edc/tests/transfer/S3ToS3EndToEndTest.java b/edc-tests/edc-end2end/end2end-transfer-cloud/src/test/java/org/eclipse/tractusx/edc/tests/transfer/S3ToS3EndToEndTest.java index e195ea437..8e70034a0 100644 --- a/edc-tests/edc-end2end/end2end-transfer-cloud/src/test/java/org/eclipse/tractusx/edc/tests/transfer/S3ToS3EndToEndTest.java +++ b/edc-tests/edc-end2end/end2end-transfer-cloud/src/test/java/org/eclipse/tractusx/edc/tests/transfer/S3ToS3EndToEndTest.java @@ -26,6 +26,7 @@ import org.eclipse.edc.junit.annotations.EndToEndTest; import org.eclipse.edc.junit.extensions.RuntimeExtension; import org.eclipse.edc.junit.testfixtures.TestUtils; +import org.eclipse.tractusx.edc.tests.aws.MinioContainer; import org.eclipse.tractusx.edc.tests.participant.TractusxParticipantBase; import org.eclipse.tractusx.edc.tests.participant.TransferParticipant; import org.junit.jupiter.api.BeforeEach; diff --git a/edc-tests/runtime/runtime-postgresql/build.gradle.kts b/edc-tests/runtime/runtime-postgresql/build.gradle.kts index 4801e40f4..21d42c42e 100644 --- a/edc-tests/runtime/runtime-postgresql/build.gradle.kts +++ b/edc-tests/runtime/runtime-postgresql/build.gradle.kts @@ -43,6 +43,8 @@ dependencies { exclude("org.eclipse.edc", "vault-hashicorp") } + implementation(libs.postgres) + implementation(libs.edc.core.controlplane) // for the controller implementation(libs.jakarta.rsApi) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cc896c232..c5e02554c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -202,6 +202,7 @@ jacksonJsonP = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jakar jakarta-rsApi = { module = "jakarta.ws.rs:jakarta.ws.rs-api", version.ref = "rsApi" } jakartaJson = { module = "org.glassfish:jakarta.json", version.ref = "jakarta-json" } junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "jupiter" } +junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "jupiter" } nimbus-jwt = { module = "com.nimbusds:nimbus-jose-jwt", version.ref = "nimbus" } opentelemetry-javaagent = { module = "io.opentelemetry.javaagent:opentelemetry-javaagent", version.ref = "opentelemetry" } netty-mockserver = { module = "org.mock-server:mockserver-netty", version.ref = "netty-mockserver" } diff --git a/samples/testing-with-mocked-connector/build.gradle.kts b/samples/testing-with-mocked-connector/build.gradle.kts index 32607c4d4..2edcaf610 100644 --- a/samples/testing-with-mocked-connector/build.gradle.kts +++ b/samples/testing-with-mocked-connector/build.gradle.kts @@ -23,7 +23,7 @@ plugins { } dependencies { - testImplementation(testFixtures(project(":edc-tests:edc-controlplane:fixtures"))) + testImplementation(testFixtures(project(":edc-tests:e2e-fixtures"))) testImplementation(libs.testcontainers.junit) testImplementation(libs.netty.mockserver) diff --git a/settings.gradle.kts b/settings.gradle.kts index a3fe63851..afee2a78e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -64,13 +64,13 @@ include(":edc-extensions:dataplane:dataplane-token-refresh:token-refresh-core") include(":edc-extensions:dataplane:dataplane-token-refresh:token-refresh-api") // test modules +include(":edc-tests:e2e-fixtures") include(":edc-tests:edc-controlplane:edr-api-tests") include(":edc-tests:edc-controlplane:catalog-tests") include(":edc-tests:edc-controlplane:transfer-tests") include(":edc-tests:edc-controlplane:iatp-tests") include(":edc-tests:edc-controlplane:policy-tests") include(":edc-tests:edc-controlplane:agreement-retirement-tests") -include(":edc-tests:edc-controlplane:fixtures") include(":edc-tests:runtime:extensions") include(":edc-tests:runtime:runtime-memory") include(":edc-tests:runtime:mock-connector")