From ae671e19e0fe06c0ce270e307db6ce88d7f46db3 Mon Sep 17 00:00:00 2001 From: Masatake Iwasaki Date: Mon, 18 Mar 2024 16:50:08 +0900 Subject: [PATCH] refactor: make the annotation name for PostgreSQL tests consistent with the tag (#4005) Signed-off-by: Masatake Iwasaki --- ...lDbIntegrationTest.java => PostgresqlIntegrationTest.java} | 2 +- .../org/eclipse/edc/test/e2e/TransferPullEndToEndTest.java | 4 ++-- .../org/eclipse/edc/test/e2e/TransferPushEndToEndTest.java | 4 ++-- .../edc/test/e2e/managementapi/AssetApiEndToEndTest.java | 4 ++-- .../edc/test/e2e/managementapi/CatalogApiEndToEndTest.java | 4 ++-- .../e2e/managementapi/ContractAgreementApiEndToEndTest.java | 4 ++-- .../e2e/managementapi/ContractDefinitionApiEndToEndTest.java | 4 ++-- .../e2e/managementapi/ContractNegotiationApiEndToEndTest.java | 4 ++-- .../e2e/managementapi/PolicyDefinitionApiEndToEndTest.java | 4 ++-- .../e2e/managementapi/TransferProcessApiEndToEndTest.java | 4 ++-- 10 files changed, 19 insertions(+), 19 deletions(-) rename core/common/junit/src/main/java/org/eclipse/edc/junit/annotations/{PostgresqlDbIntegrationTest.java => PostgresqlIntegrationTest.java} (95%) diff --git a/core/common/junit/src/main/java/org/eclipse/edc/junit/annotations/PostgresqlDbIntegrationTest.java b/core/common/junit/src/main/java/org/eclipse/edc/junit/annotations/PostgresqlIntegrationTest.java similarity index 95% rename from core/common/junit/src/main/java/org/eclipse/edc/junit/annotations/PostgresqlDbIntegrationTest.java rename to core/common/junit/src/main/java/org/eclipse/edc/junit/annotations/PostgresqlIntegrationTest.java index f53e314ca18..0bbeef278df 100644 --- a/core/common/junit/src/main/java/org/eclipse/edc/junit/annotations/PostgresqlDbIntegrationTest.java +++ b/core/common/junit/src/main/java/org/eclipse/edc/junit/annotations/PostgresqlIntegrationTest.java @@ -31,5 +31,5 @@ @IntegrationTest @Testcontainers @Tag("PostgresqlIntegrationTest") -public @interface PostgresqlDbIntegrationTest { +public @interface PostgresqlIntegrationTest { } diff --git a/system-tests/e2e-transfer-test/runner/src/test/java/org/eclipse/edc/test/e2e/TransferPullEndToEndTest.java b/system-tests/e2e-transfer-test/runner/src/test/java/org/eclipse/edc/test/e2e/TransferPullEndToEndTest.java index 3955aa890b0..7fb563c5ee2 100644 --- a/system-tests/e2e-transfer-test/runner/src/test/java/org/eclipse/edc/test/e2e/TransferPullEndToEndTest.java +++ b/system-tests/e2e-transfer-test/runner/src/test/java/org/eclipse/edc/test/e2e/TransferPullEndToEndTest.java @@ -17,7 +17,7 @@ import jakarta.json.Json; import jakarta.json.JsonObject; import org.eclipse.edc.junit.annotations.EndToEndTest; -import org.eclipse.edc.junit.annotations.PostgresqlDbIntegrationTest; +import org.eclipse.edc.junit.annotations.PostgresqlIntegrationTest; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; @@ -48,7 +48,7 @@ class InMemory extends Tests implements InMemoryRuntimes { } @Nested - @PostgresqlDbIntegrationTest + @PostgresqlIntegrationTest class Postgres extends Tests implements PostgresRuntimes { } diff --git a/system-tests/e2e-transfer-test/runner/src/test/java/org/eclipse/edc/test/e2e/TransferPushEndToEndTest.java b/system-tests/e2e-transfer-test/runner/src/test/java/org/eclipse/edc/test/e2e/TransferPushEndToEndTest.java index f529812e4e1..e3ccf330d93 100644 --- a/system-tests/e2e-transfer-test/runner/src/test/java/org/eclipse/edc/test/e2e/TransferPushEndToEndTest.java +++ b/system-tests/e2e-transfer-test/runner/src/test/java/org/eclipse/edc/test/e2e/TransferPushEndToEndTest.java @@ -17,7 +17,7 @@ import jakarta.json.Json; import jakarta.json.JsonObject; import org.eclipse.edc.junit.annotations.EndToEndTest; -import org.eclipse.edc.junit.annotations.PostgresqlDbIntegrationTest; +import org.eclipse.edc.junit.annotations.PostgresqlIntegrationTest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; @@ -47,7 +47,7 @@ class InMemory extends Tests implements InMemoryRuntimes { } @Nested - @PostgresqlDbIntegrationTest + @PostgresqlIntegrationTest class Postgres extends Tests implements PostgresRuntimes { } diff --git a/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/AssetApiEndToEndTest.java b/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/AssetApiEndToEndTest.java index 8da493c24b9..d2107595a20 100644 --- a/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/AssetApiEndToEndTest.java +++ b/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/AssetApiEndToEndTest.java @@ -17,7 +17,7 @@ import io.restassured.http.ContentType; import jakarta.json.JsonObjectBuilder; import org.eclipse.edc.junit.annotations.EndToEndTest; -import org.eclipse.edc.junit.annotations.PostgresqlDbIntegrationTest; +import org.eclipse.edc.junit.annotations.PostgresqlIntegrationTest; import org.eclipse.edc.junit.extensions.EdcRuntimeExtension; import org.eclipse.edc.spi.asset.AssetIndex; import org.eclipse.edc.spi.types.domain.DataAddress; @@ -56,7 +56,7 @@ class InMemory extends Tests implements InMemoryRuntime { } @Nested - @PostgresqlDbIntegrationTest + @PostgresqlIntegrationTest class Postgres extends Tests implements PostgresRuntime { Postgres() { diff --git a/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/CatalogApiEndToEndTest.java b/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/CatalogApiEndToEndTest.java index 54e6ce8f4d1..9a9e50ac4d0 100644 --- a/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/CatalogApiEndToEndTest.java +++ b/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/CatalogApiEndToEndTest.java @@ -19,7 +19,7 @@ import org.eclipse.edc.connector.policy.spi.PolicyDefinition; import org.eclipse.edc.connector.policy.spi.store.PolicyDefinitionStore; import org.eclipse.edc.junit.annotations.EndToEndTest; -import org.eclipse.edc.junit.annotations.PostgresqlDbIntegrationTest; +import org.eclipse.edc.junit.annotations.PostgresqlIntegrationTest; import org.eclipse.edc.junit.extensions.EdcRuntimeExtension; import org.eclipse.edc.policy.model.Policy; import org.eclipse.edc.spi.asset.AssetIndex; @@ -55,7 +55,7 @@ class InMemory extends Tests implements InMemoryRuntime { } @Nested - @PostgresqlDbIntegrationTest + @PostgresqlIntegrationTest class Postgres extends Tests implements PostgresRuntime { Postgres() { diff --git a/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/ContractAgreementApiEndToEndTest.java b/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/ContractAgreementApiEndToEndTest.java index 53ce009a7e7..0d4997759fd 100644 --- a/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/ContractAgreementApiEndToEndTest.java +++ b/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/ContractAgreementApiEndToEndTest.java @@ -17,7 +17,7 @@ import org.eclipse.edc.connector.contract.spi.negotiation.store.ContractNegotiationStore; import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractNegotiation; import org.eclipse.edc.junit.annotations.EndToEndTest; -import org.eclipse.edc.junit.annotations.PostgresqlDbIntegrationTest; +import org.eclipse.edc.junit.annotations.PostgresqlIntegrationTest; import org.eclipse.edc.junit.extensions.EdcRuntimeExtension; import org.eclipse.edc.policy.model.Policy; import org.eclipse.edc.spi.types.domain.agreement.ContractAgreement; @@ -50,7 +50,7 @@ class InMemory extends Tests implements InMemoryRuntime { } @Nested - @PostgresqlDbIntegrationTest + @PostgresqlIntegrationTest class Postgres extends Tests implements PostgresRuntime { Postgres() { diff --git a/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/ContractDefinitionApiEndToEndTest.java b/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/ContractDefinitionApiEndToEndTest.java index 0da278668c2..9c4f1c1dadf 100644 --- a/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/ContractDefinitionApiEndToEndTest.java +++ b/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/ContractDefinitionApiEndToEndTest.java @@ -20,7 +20,7 @@ import org.eclipse.edc.connector.contract.spi.offer.store.ContractDefinitionStore; import org.eclipse.edc.connector.contract.spi.types.offer.ContractDefinition; import org.eclipse.edc.junit.annotations.EndToEndTest; -import org.eclipse.edc.junit.annotations.PostgresqlDbIntegrationTest; +import org.eclipse.edc.junit.annotations.PostgresqlIntegrationTest; import org.eclipse.edc.junit.extensions.EdcRuntimeExtension; import org.eclipse.edc.sql.testfixtures.PostgresqlEndToEndInstance; import org.junit.jupiter.api.BeforeAll; @@ -57,7 +57,7 @@ class InMemory extends Tests implements InMemoryRuntime { } @Nested - @PostgresqlDbIntegrationTest + @PostgresqlIntegrationTest class Postgres extends Tests implements PostgresRuntime { Postgres() { diff --git a/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/ContractNegotiationApiEndToEndTest.java b/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/ContractNegotiationApiEndToEndTest.java index c10b3d64834..85bdd6eda3e 100644 --- a/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/ContractNegotiationApiEndToEndTest.java +++ b/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/ContractNegotiationApiEndToEndTest.java @@ -21,7 +21,7 @@ import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractNegotiation; import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractNegotiationStates; import org.eclipse.edc.junit.annotations.EndToEndTest; -import org.eclipse.edc.junit.annotations.PostgresqlDbIntegrationTest; +import org.eclipse.edc.junit.annotations.PostgresqlIntegrationTest; import org.eclipse.edc.junit.extensions.EdcRuntimeExtension; import org.eclipse.edc.policy.model.Policy; import org.eclipse.edc.spi.types.domain.agreement.ContractAgreement; @@ -67,7 +67,7 @@ class InMemory extends Tests implements InMemoryRuntime { } @Nested - @PostgresqlDbIntegrationTest + @PostgresqlIntegrationTest class Postgres extends Tests implements PostgresRuntime { Postgres() { diff --git a/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/PolicyDefinitionApiEndToEndTest.java b/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/PolicyDefinitionApiEndToEndTest.java index cd34139261e..9249dd3c527 100644 --- a/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/PolicyDefinitionApiEndToEndTest.java +++ b/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/PolicyDefinitionApiEndToEndTest.java @@ -18,7 +18,7 @@ import org.eclipse.edc.connector.policy.spi.PolicyDefinition; import org.eclipse.edc.connector.policy.spi.store.PolicyDefinitionStore; import org.eclipse.edc.junit.annotations.EndToEndTest; -import org.eclipse.edc.junit.annotations.PostgresqlDbIntegrationTest; +import org.eclipse.edc.junit.annotations.PostgresqlIntegrationTest; import org.eclipse.edc.junit.extensions.EdcRuntimeExtension; import org.eclipse.edc.policy.model.Policy; import org.eclipse.edc.sql.testfixtures.PostgresqlEndToEndInstance; @@ -59,7 +59,7 @@ class InMemory extends Tests implements InMemoryRuntime { } @Nested - @PostgresqlDbIntegrationTest + @PostgresqlIntegrationTest class Postgres extends Tests implements PostgresRuntime { Postgres() { diff --git a/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/TransferProcessApiEndToEndTest.java b/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/TransferProcessApiEndToEndTest.java index bedf999c621..ffa5b4e4199 100644 --- a/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/TransferProcessApiEndToEndTest.java +++ b/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/TransferProcessApiEndToEndTest.java @@ -24,7 +24,7 @@ import org.eclipse.edc.connector.transfer.spi.types.TransferProcess; import org.eclipse.edc.jsonld.util.JacksonJsonLd; import org.eclipse.edc.junit.annotations.EndToEndTest; -import org.eclipse.edc.junit.annotations.PostgresqlDbIntegrationTest; +import org.eclipse.edc.junit.annotations.PostgresqlIntegrationTest; import org.eclipse.edc.junit.extensions.EdcRuntimeExtension; import org.eclipse.edc.spi.types.domain.DataAddress; import org.eclipse.edc.spi.types.domain.callback.CallbackAddress; @@ -68,7 +68,7 @@ class InMemory extends Tests implements InMemoryRuntime { } @Nested - @PostgresqlDbIntegrationTest + @PostgresqlIntegrationTest class Postgres extends Tests implements PostgresRuntime { Postgres() {