From 246ca9e7a42982bad9e2a8a216aef9c327c5c380 Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger Date: Fri, 3 May 2024 08:01:58 +0200 Subject: [PATCH] rename mock-edc -> mock-connector --- .github/workflows/publish-docker.yaml | 2 +- .github/workflows/publish-new-release.yml | 2 +- .github/workflows/verify.yaml | 2 +- docs/development/mock-edc.md | 22 +++++++++---------- .../build.gradle.kts | 0 .../src/main/docker/Dockerfile | 0 .../eclipse/tractusx/edc/mock/MatchType.java | 0 .../edc/mock/MockServiceExtension.java | 0 .../tractusx/edc/mock/RecordedRequest.java | 0 .../mock/RecordedResponseDeserializer.java | 0 .../tractusx/edc/mock/ResponseQueue.java | 0 .../edc/mock/ServiceFailureDeserializer.java | 0 .../instrumentation/InstrumentationApi.java | 0 .../InstrumentationApiController.java | 0 .../mock/services/AbstractServiceStub.java | 0 .../edc/mock/services/AssetServiceStub.java | 0 .../ContractAgreementServiceStub.java | 0 .../ContractDefinitionServiceStub.java | 0 .../ContractNegotiationServiceStub.java | 0 .../services/PolicyDefinitionServiceStub.java | 0 .../services/TransferProcessServiceStub.java | 0 ...rg.eclipse.edc.spi.system.ServiceExtension | 0 .../edc/mock/RecordedRequestTest.java | 0 .../src/test/resources/asset.creation.json | 0 .../src/test/resources/asset.failure.json | 0 .../build.gradle.kts | 0 .../mockedc/UseMockConnectorSampleTest.java} | 6 ++--- .../resources/asset.creation.failure.json | 0 .../src/test/resources/asset.creation.json | 0 .../src/test/resources/asset.request.json | 0 .../test/resources/contractdef.creation.json | 0 .../resources/transferprocess.request.json | 0 settings.gradle.kts | 4 ++-- 33 files changed, 19 insertions(+), 19 deletions(-) rename edc-tests/runtime/{edc-mock => mock-connector}/build.gradle.kts (100%) rename edc-tests/runtime/{edc-mock => mock-connector}/src/main/docker/Dockerfile (100%) rename edc-tests/runtime/{edc-mock => mock-connector}/src/main/java/org/eclipse/tractusx/edc/mock/MatchType.java (100%) rename edc-tests/runtime/{edc-mock => mock-connector}/src/main/java/org/eclipse/tractusx/edc/mock/MockServiceExtension.java (100%) rename edc-tests/runtime/{edc-mock => mock-connector}/src/main/java/org/eclipse/tractusx/edc/mock/RecordedRequest.java (100%) rename edc-tests/runtime/{edc-mock => mock-connector}/src/main/java/org/eclipse/tractusx/edc/mock/RecordedResponseDeserializer.java (100%) rename edc-tests/runtime/{edc-mock => mock-connector}/src/main/java/org/eclipse/tractusx/edc/mock/ResponseQueue.java (100%) rename edc-tests/runtime/{edc-mock => mock-connector}/src/main/java/org/eclipse/tractusx/edc/mock/ServiceFailureDeserializer.java (100%) rename edc-tests/runtime/{edc-mock => mock-connector}/src/main/java/org/eclipse/tractusx/edc/mock/api/instrumentation/InstrumentationApi.java (100%) rename edc-tests/runtime/{edc-mock => mock-connector}/src/main/java/org/eclipse/tractusx/edc/mock/api/instrumentation/InstrumentationApiController.java (100%) rename edc-tests/runtime/{edc-mock => mock-connector}/src/main/java/org/eclipse/tractusx/edc/mock/services/AbstractServiceStub.java (100%) rename edc-tests/runtime/{edc-mock => mock-connector}/src/main/java/org/eclipse/tractusx/edc/mock/services/AssetServiceStub.java (100%) rename edc-tests/runtime/{edc-mock => mock-connector}/src/main/java/org/eclipse/tractusx/edc/mock/services/ContractAgreementServiceStub.java (100%) rename edc-tests/runtime/{edc-mock => mock-connector}/src/main/java/org/eclipse/tractusx/edc/mock/services/ContractDefinitionServiceStub.java (100%) rename edc-tests/runtime/{edc-mock => mock-connector}/src/main/java/org/eclipse/tractusx/edc/mock/services/ContractNegotiationServiceStub.java (100%) rename edc-tests/runtime/{edc-mock => mock-connector}/src/main/java/org/eclipse/tractusx/edc/mock/services/PolicyDefinitionServiceStub.java (100%) rename edc-tests/runtime/{edc-mock => mock-connector}/src/main/java/org/eclipse/tractusx/edc/mock/services/TransferProcessServiceStub.java (100%) rename edc-tests/runtime/{edc-mock => mock-connector}/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension (100%) rename edc-tests/runtime/{edc-mock => mock-connector}/src/test/java/org/eclipse/tractusx/edc/mock/RecordedRequestTest.java (100%) rename edc-tests/runtime/{edc-mock => mock-connector}/src/test/resources/asset.creation.json (100%) rename edc-tests/runtime/{edc-mock => mock-connector}/src/test/resources/asset.failure.json (100%) rename samples/{testing-with-mocked-edc => testing-with-mocked-connector}/build.gradle.kts (100%) rename samples/{testing-with-mocked-edc/src/test/java/org/eclipse/tractusx/edc/samples/mockedc/UseMockedEdcSampleTest.java => testing-with-mocked-connector/src/test/java/org/eclipse/tractusx/edc/samples/mockedc/UseMockConnectorSampleTest.java} (96%) rename samples/{testing-with-mocked-edc => testing-with-mocked-connector}/src/test/resources/asset.creation.failure.json (100%) rename samples/{testing-with-mocked-edc => testing-with-mocked-connector}/src/test/resources/asset.creation.json (100%) rename samples/{testing-with-mocked-edc => testing-with-mocked-connector}/src/test/resources/asset.request.json (100%) rename samples/{testing-with-mocked-edc => testing-with-mocked-connector}/src/test/resources/contractdef.creation.json (100%) rename samples/{testing-with-mocked-edc => testing-with-mocked-connector}/src/test/resources/transferprocess.request.json (100%) diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml index fc81c785d..bf5ac3b01 100644 --- a/.github/workflows/publish-docker.yaml +++ b/.github/workflows/publish-docker.yaml @@ -50,7 +50,7 @@ jobs: { dir: edc-controlplane, img: edc-controlplane-postgresql-azure-vault }, { dir: edc-dataplane, img: edc-dataplane-azure-vault }, { dir: edc-dataplane, img: edc-dataplane-hashicorp-vault }, - { dir: edc-tests/runtime, img: edc-mock }] + { dir: edc-tests/runtime, img: mock-connector }] permissions: contents: write packages: write diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml index 049926342..f87be958e 100644 --- a/.github/workflows/publish-new-release.yml +++ b/.github/workflows/publish-new-release.yml @@ -105,7 +105,7 @@ jobs: { dir: edc-controlplane, img: edc-controlplane-postgresql-azure-vault }, { dir: edc-dataplane, img: edc-dataplane-azure-vault }, { dir: edc-dataplane, img: edc-dataplane-hashicorp-vault }, - { dir: edc-tests/runtime, img: edc-mock }] + { dir: edc-tests/runtime, img: mock-connector }] steps: - uses: actions/checkout@v4 - name: Export RELEASE_VERSION env diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml index 826ab0ef1..88bf8d850 100644 --- a/.github/workflows/verify.yaml +++ b/.github/workflows/verify.yaml @@ -96,7 +96,7 @@ jobs: - name: Run Integration tests run: | - ./gradlew :edc-tests:runtime:edc-mock:dockerize + ./gradlew :edc-tests:runtime:mock-connector:dockerize ./gradlew test -DincludeTags="ComponentTest" api-tests: diff --git a/docs/development/mock-edc.md b/docs/development/mock-edc.md index b3954dcbc..2efdaf995 100644 --- a/docs/development/mock-edc.md +++ b/docs/development/mock-edc.md @@ -1,4 +1,4 @@ -# Using the Mock-EDC for contract-based testing +# Using the Mock-Connector for contract-based testing Modern testing methodologies are based on small, independent units of code that have a defined behaviour. Implementations as well as testing should be fast, repeatable, continuous and easily maintainable. In the context of EDC @@ -7,12 +7,12 @@ test their workflows. While the Tractus-X EDC project did provide a pure in-memo requires all the configuration and a complex runtime environment to work, which may be a high barrier of entry. For this reason, and to developers who primarily interact with the Management API of a connector, the Tractus-X EDC -project provides a testing framework with an even smaller footprint called the "Mock-EDC". It is a Docker image, that +project provides a testing framework with an even smaller footprint called the "Mock-Connector". It is a Docker image, that contains just the Management API plus an instrumentation interface to enable developers to use this in their unit/component testing and in continuous integration. We call this "contract-based testing", as it defines the specified behaviour of an application (here: the connector). -The Mock-EDC's Management API is guaranteed to behave exactly the same, in fact, it even runs the +The Mock-Connector's Management API is guaranteed to behave exactly the same, in fact, it even runs the same code as a "real" EDC. ## 1. The contract @@ -31,7 +31,7 @@ The [Management API spec](https://eclipse-edc.github.io/Connector/openapi/manage ## 2. Intended audience Developers who build their applications and systems based on EDC, and interact with EDC through the Management API can -use the Mock-EDC to decrease friction by not having to spin up and configure a fully-fledged connector runtime. +use the Mock-Connector to decrease friction by not having to spin up and configure a fully-fledged connector runtime. Developers who plan to work with (Tractus-X) EDC in another way, like directly using its Maven artifacts, or even by implementing a DSP protocol head are kindly redirected to @@ -39,9 +39,9 @@ the [additional references section](#5-references-and-further-reading). ## 3. Use with TestContainers -Mock-EDC should be used as Docker image, we publish it as `tractusx/edc-mock`. +Mock-Connector should be used as Docker image, we publish it as `tractusx/edc-mock`. -Using the Mock-EDC is very easy, we recommend usage via Testcontainers. For example, setting up a JUnit test for a +Using the Mock-Connector is very easy, we recommend usage via Testcontainers. For example, setting up a JUnit test for a client application using Testcontainers could be done as follows: ```java @@ -67,7 +67,7 @@ public class UseMockedEdcSampleTest { } ``` -This downloads and runs the Docker image for the Mock-EDC and supplies it with minimal configuration. Specifically, it +This downloads and runs the Docker image for the Mock-Connector and supplies it with minimal configuration. Specifically, it exposes the Management API and the default context, because that is needed to set up the mock. > Please note that in @@ -152,7 +152,7 @@ different HTTP response code, i.e. 400, and the response body contains an error ## 4. Request pipeline and the instrumentation API -The Mock-EDC internally contains a pipeline of "recorded requests", much like mocked HTTP webservers, like Netty +The Mock-Connector internally contains a pipeline of "recorded requests", much like mocked HTTP webservers, like Netty Mockserver or OkHttp MockWebServer. Out-of-the-box, that pipeline is empty, which means the Management API would always respond with an error like the following: @@ -169,12 +169,12 @@ respond with an error like the following: To get beyond that, we need to _prime_ the mock. That means, we need to tell it how to respond to the next request by inserting a "recorded request" into its request pipeline. In previous code examples, this was done using -the `setupNextResponse()` method. Mock-EDC offers an instrumentation API which can be used to insert recorded requests, +the `setupNextResponse()` method. Mock-Connector offers an instrumentation API which can be used to insert recorded requests, to clear the queue and to get a count. ### 4.1 Recorded requests -A `RecordedRequest` is a POJO, that tells the Mock-EDC how to respond to the _next_ Management API request. To that end, +A `RecordedRequest` is a POJO, that tells the Mock-Connector how to respond to the _next_ Management API request. To that end, it contains the input parameter type, the data associated with it, plus the return value type plus - most importantly - the data that is supposed to be returned. @@ -206,7 +206,7 @@ POST /api/instrumentation -> adds a new RecordedRequest, JSON must be in t ## 5. References and further reading -- A complete sample how to run a test using the Mock-EDC in a Testcontainer can be +- A complete sample how to run a test using the Mock-Connector in a Testcontainer can be found [here](../../samples/testing-with-mocked-edc) - To test compliance with DSP, use the [TCK](https://github.com/eclipse-dataspacetck/cvf) - A Mock-IATP runtime is planned for future releases. diff --git a/edc-tests/runtime/edc-mock/build.gradle.kts b/edc-tests/runtime/mock-connector/build.gradle.kts similarity index 100% rename from edc-tests/runtime/edc-mock/build.gradle.kts rename to edc-tests/runtime/mock-connector/build.gradle.kts diff --git a/edc-tests/runtime/edc-mock/src/main/docker/Dockerfile b/edc-tests/runtime/mock-connector/src/main/docker/Dockerfile similarity index 100% rename from edc-tests/runtime/edc-mock/src/main/docker/Dockerfile rename to edc-tests/runtime/mock-connector/src/main/docker/Dockerfile diff --git a/edc-tests/runtime/edc-mock/src/main/java/org/eclipse/tractusx/edc/mock/MatchType.java b/edc-tests/runtime/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/MatchType.java similarity index 100% rename from edc-tests/runtime/edc-mock/src/main/java/org/eclipse/tractusx/edc/mock/MatchType.java rename to edc-tests/runtime/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/MatchType.java diff --git a/edc-tests/runtime/edc-mock/src/main/java/org/eclipse/tractusx/edc/mock/MockServiceExtension.java b/edc-tests/runtime/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/MockServiceExtension.java similarity index 100% rename from edc-tests/runtime/edc-mock/src/main/java/org/eclipse/tractusx/edc/mock/MockServiceExtension.java rename to edc-tests/runtime/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/MockServiceExtension.java diff --git a/edc-tests/runtime/edc-mock/src/main/java/org/eclipse/tractusx/edc/mock/RecordedRequest.java b/edc-tests/runtime/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/RecordedRequest.java similarity index 100% rename from edc-tests/runtime/edc-mock/src/main/java/org/eclipse/tractusx/edc/mock/RecordedRequest.java rename to edc-tests/runtime/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/RecordedRequest.java diff --git a/edc-tests/runtime/edc-mock/src/main/java/org/eclipse/tractusx/edc/mock/RecordedResponseDeserializer.java b/edc-tests/runtime/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/RecordedResponseDeserializer.java similarity index 100% rename from edc-tests/runtime/edc-mock/src/main/java/org/eclipse/tractusx/edc/mock/RecordedResponseDeserializer.java rename to edc-tests/runtime/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/RecordedResponseDeserializer.java diff --git a/edc-tests/runtime/edc-mock/src/main/java/org/eclipse/tractusx/edc/mock/ResponseQueue.java b/edc-tests/runtime/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/ResponseQueue.java similarity index 100% rename from edc-tests/runtime/edc-mock/src/main/java/org/eclipse/tractusx/edc/mock/ResponseQueue.java rename to edc-tests/runtime/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/ResponseQueue.java diff --git a/edc-tests/runtime/edc-mock/src/main/java/org/eclipse/tractusx/edc/mock/ServiceFailureDeserializer.java b/edc-tests/runtime/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/ServiceFailureDeserializer.java similarity index 100% rename from edc-tests/runtime/edc-mock/src/main/java/org/eclipse/tractusx/edc/mock/ServiceFailureDeserializer.java rename to edc-tests/runtime/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/ServiceFailureDeserializer.java diff --git a/edc-tests/runtime/edc-mock/src/main/java/org/eclipse/tractusx/edc/mock/api/instrumentation/InstrumentationApi.java b/edc-tests/runtime/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/api/instrumentation/InstrumentationApi.java similarity index 100% rename from edc-tests/runtime/edc-mock/src/main/java/org/eclipse/tractusx/edc/mock/api/instrumentation/InstrumentationApi.java rename to edc-tests/runtime/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/api/instrumentation/InstrumentationApi.java diff --git a/edc-tests/runtime/edc-mock/src/main/java/org/eclipse/tractusx/edc/mock/api/instrumentation/InstrumentationApiController.java b/edc-tests/runtime/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/api/instrumentation/InstrumentationApiController.java similarity index 100% rename from edc-tests/runtime/edc-mock/src/main/java/org/eclipse/tractusx/edc/mock/api/instrumentation/InstrumentationApiController.java rename to edc-tests/runtime/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/api/instrumentation/InstrumentationApiController.java diff --git a/edc-tests/runtime/edc-mock/src/main/java/org/eclipse/tractusx/edc/mock/services/AbstractServiceStub.java b/edc-tests/runtime/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/services/AbstractServiceStub.java similarity index 100% rename from edc-tests/runtime/edc-mock/src/main/java/org/eclipse/tractusx/edc/mock/services/AbstractServiceStub.java rename to edc-tests/runtime/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/services/AbstractServiceStub.java diff --git a/edc-tests/runtime/edc-mock/src/main/java/org/eclipse/tractusx/edc/mock/services/AssetServiceStub.java b/edc-tests/runtime/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/services/AssetServiceStub.java similarity index 100% rename from edc-tests/runtime/edc-mock/src/main/java/org/eclipse/tractusx/edc/mock/services/AssetServiceStub.java rename to edc-tests/runtime/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/services/AssetServiceStub.java diff --git a/edc-tests/runtime/edc-mock/src/main/java/org/eclipse/tractusx/edc/mock/services/ContractAgreementServiceStub.java b/edc-tests/runtime/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/services/ContractAgreementServiceStub.java similarity index 100% rename from edc-tests/runtime/edc-mock/src/main/java/org/eclipse/tractusx/edc/mock/services/ContractAgreementServiceStub.java rename to edc-tests/runtime/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/services/ContractAgreementServiceStub.java diff --git a/edc-tests/runtime/edc-mock/src/main/java/org/eclipse/tractusx/edc/mock/services/ContractDefinitionServiceStub.java b/edc-tests/runtime/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/services/ContractDefinitionServiceStub.java similarity index 100% rename from edc-tests/runtime/edc-mock/src/main/java/org/eclipse/tractusx/edc/mock/services/ContractDefinitionServiceStub.java rename to edc-tests/runtime/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/services/ContractDefinitionServiceStub.java diff --git a/edc-tests/runtime/edc-mock/src/main/java/org/eclipse/tractusx/edc/mock/services/ContractNegotiationServiceStub.java b/edc-tests/runtime/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/services/ContractNegotiationServiceStub.java similarity index 100% rename from edc-tests/runtime/edc-mock/src/main/java/org/eclipse/tractusx/edc/mock/services/ContractNegotiationServiceStub.java rename to edc-tests/runtime/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/services/ContractNegotiationServiceStub.java diff --git a/edc-tests/runtime/edc-mock/src/main/java/org/eclipse/tractusx/edc/mock/services/PolicyDefinitionServiceStub.java b/edc-tests/runtime/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/services/PolicyDefinitionServiceStub.java similarity index 100% rename from edc-tests/runtime/edc-mock/src/main/java/org/eclipse/tractusx/edc/mock/services/PolicyDefinitionServiceStub.java rename to edc-tests/runtime/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/services/PolicyDefinitionServiceStub.java diff --git a/edc-tests/runtime/edc-mock/src/main/java/org/eclipse/tractusx/edc/mock/services/TransferProcessServiceStub.java b/edc-tests/runtime/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/services/TransferProcessServiceStub.java similarity index 100% rename from edc-tests/runtime/edc-mock/src/main/java/org/eclipse/tractusx/edc/mock/services/TransferProcessServiceStub.java rename to edc-tests/runtime/mock-connector/src/main/java/org/eclipse/tractusx/edc/mock/services/TransferProcessServiceStub.java diff --git a/edc-tests/runtime/edc-mock/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/edc-tests/runtime/mock-connector/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension similarity index 100% rename from edc-tests/runtime/edc-mock/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension rename to edc-tests/runtime/mock-connector/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension diff --git a/edc-tests/runtime/edc-mock/src/test/java/org/eclipse/tractusx/edc/mock/RecordedRequestTest.java b/edc-tests/runtime/mock-connector/src/test/java/org/eclipse/tractusx/edc/mock/RecordedRequestTest.java similarity index 100% rename from edc-tests/runtime/edc-mock/src/test/java/org/eclipse/tractusx/edc/mock/RecordedRequestTest.java rename to edc-tests/runtime/mock-connector/src/test/java/org/eclipse/tractusx/edc/mock/RecordedRequestTest.java diff --git a/edc-tests/runtime/edc-mock/src/test/resources/asset.creation.json b/edc-tests/runtime/mock-connector/src/test/resources/asset.creation.json similarity index 100% rename from edc-tests/runtime/edc-mock/src/test/resources/asset.creation.json rename to edc-tests/runtime/mock-connector/src/test/resources/asset.creation.json diff --git a/edc-tests/runtime/edc-mock/src/test/resources/asset.failure.json b/edc-tests/runtime/mock-connector/src/test/resources/asset.failure.json similarity index 100% rename from edc-tests/runtime/edc-mock/src/test/resources/asset.failure.json rename to edc-tests/runtime/mock-connector/src/test/resources/asset.failure.json diff --git a/samples/testing-with-mocked-edc/build.gradle.kts b/samples/testing-with-mocked-connector/build.gradle.kts similarity index 100% rename from samples/testing-with-mocked-edc/build.gradle.kts rename to samples/testing-with-mocked-connector/build.gradle.kts diff --git a/samples/testing-with-mocked-edc/src/test/java/org/eclipse/tractusx/edc/samples/mockedc/UseMockedEdcSampleTest.java b/samples/testing-with-mocked-connector/src/test/java/org/eclipse/tractusx/edc/samples/mockedc/UseMockConnectorSampleTest.java similarity index 96% rename from samples/testing-with-mocked-edc/src/test/java/org/eclipse/tractusx/edc/samples/mockedc/UseMockedEdcSampleTest.java rename to samples/testing-with-mocked-connector/src/test/java/org/eclipse/tractusx/edc/samples/mockedc/UseMockConnectorSampleTest.java index 77be10811..853ac577e 100644 --- a/samples/testing-with-mocked-edc/src/test/java/org/eclipse/tractusx/edc/samples/mockedc/UseMockedEdcSampleTest.java +++ b/samples/testing-with-mocked-connector/src/test/java/org/eclipse/tractusx/edc/samples/mockedc/UseMockConnectorSampleTest.java @@ -34,15 +34,15 @@ import static org.assertj.core.api.Assertions.assertThat; /** - * This example demonstrates how to use the Mock-EDC as a drop-in replacement runtime for testing client code that uses EDC's + * This example demonstrates how to use the Mock-Connector as a drop-in replacement runtime for testing client code that uses EDC's * Management API. While this is written in Java, the concepts are easily translatable into any language where test containers are * supported. */ @Testcontainers @ComponentTest -public class UseMockedEdcSampleTest { +public class UseMockConnectorSampleTest { @Container - protected static GenericContainer edcContainer = new GenericContainer<>("edc-mock") + protected static GenericContainer edcContainer = new GenericContainer<>("mock-connector") .withEnv("WEB_HTTP_PORT", "8080") .withEnv("WEB_HTTP_PATH", "/api") .withEnv("WEB_HTTP_MANAGEMENT_PORT", "8081") diff --git a/samples/testing-with-mocked-edc/src/test/resources/asset.creation.failure.json b/samples/testing-with-mocked-connector/src/test/resources/asset.creation.failure.json similarity index 100% rename from samples/testing-with-mocked-edc/src/test/resources/asset.creation.failure.json rename to samples/testing-with-mocked-connector/src/test/resources/asset.creation.failure.json diff --git a/samples/testing-with-mocked-edc/src/test/resources/asset.creation.json b/samples/testing-with-mocked-connector/src/test/resources/asset.creation.json similarity index 100% rename from samples/testing-with-mocked-edc/src/test/resources/asset.creation.json rename to samples/testing-with-mocked-connector/src/test/resources/asset.creation.json diff --git a/samples/testing-with-mocked-edc/src/test/resources/asset.request.json b/samples/testing-with-mocked-connector/src/test/resources/asset.request.json similarity index 100% rename from samples/testing-with-mocked-edc/src/test/resources/asset.request.json rename to samples/testing-with-mocked-connector/src/test/resources/asset.request.json diff --git a/samples/testing-with-mocked-edc/src/test/resources/contractdef.creation.json b/samples/testing-with-mocked-connector/src/test/resources/contractdef.creation.json similarity index 100% rename from samples/testing-with-mocked-edc/src/test/resources/contractdef.creation.json rename to samples/testing-with-mocked-connector/src/test/resources/contractdef.creation.json diff --git a/samples/testing-with-mocked-edc/src/test/resources/transferprocess.request.json b/samples/testing-with-mocked-connector/src/test/resources/transferprocess.request.json similarity index 100% rename from samples/testing-with-mocked-edc/src/test/resources/transferprocess.request.json rename to samples/testing-with-mocked-connector/src/test/resources/transferprocess.request.json diff --git a/settings.gradle.kts b/settings.gradle.kts index e0b63c823..9f5dc1e2b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -67,7 +67,7 @@ include(":edc-tests:edc-controlplane:policy-tests") include(":edc-tests:edc-controlplane:fixtures") include(":edc-tests:runtime:extensions") include(":edc-tests:runtime:runtime-memory") -include(":edc-tests:runtime:edc-mock") +include(":edc-tests:runtime:mock-connector") include(":edc-tests:runtime:dataplane-cloud") include(":edc-tests:runtime:runtime-postgresql") include(":edc-tests:runtime:iatp:runtime-memory-iatp-ih") @@ -94,7 +94,7 @@ include(":edc-dataplane:edc-dataplane-hashicorp-vault") include(":samples:multi-tenancy") -include(":samples:testing-with-mocked-edc") +include(":samples:testing-with-mocked-connector") // this is needed to have access to snapshot builds of plugins