chore: E2E tests refactor (#1169)

eclipse-tractusx · Mar 28, 2024 · b2ab647 · b2ab647
1 parent b83338b
commit b2ab647
Show file tree

Hide file tree

Showing 50 changed files with 1,162 additions and 1,946 deletions.
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/DimParticipant.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/DimParticipant.java
@@ -19,7 +19,7 @@
 
 package org.eclipse.tractusx.edc.lifecycle;
 
-import org.eclipse.tractusx.edc.tests.TractusxIatpParticipantBase;
+import org.eclipse.tractusx.edc.tests.participant.TractusxIatpParticipantBase;
 
 import java.net.URI;
 import java.util.HashMap;
@@ -42,7 +42,7 @@ public Map<String, String> iatpConfiguration(TractusxIatpParticipantBase... othe
     }
 
     public static class Builder extends TractusxIatpParticipantBase.Builder<DimParticipant, Builder> {
-        
+
         protected Builder() {
             super(new DimParticipant());
         }

diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/MiwParticipant.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/MiwParticipant.java
@@ -19,7 +19,7 @@
 
 package org.eclipse.tractusx.edc.lifecycle;
 
-import org.eclipse.tractusx.edc.tests.TractusxParticipantBase;
+import org.eclipse.tractusx.edc.tests.participant.TractusxParticipantBase;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -29,7 +29,7 @@
  * Extension of {@link TractusxParticipantBase} with MIW specific configuration
  */
 public class MiwParticipant extends TractusxParticipantBase {
-    
+
     protected String miwUri;
     protected String oauth2Uri;
 

diff --git a/...usx/edc/tests/catalog/DimCatalogTest.java → ...ts/catalog/DimCatalogIntegrationTest.java b/...usx/edc/tests/catalog/DimCatalogTest.java → ...ts/catalog/DimCatalogIntegrationTest.java
@@ -41,7 +41,7 @@
 
 @DimIntegrationTest
 @Disabled
-public class DimCatalogTest {
+public class DimCatalogIntegrationTest {
 
     protected static final DimParticipant SOKRATES = configureParticipant(SOKRATES_NAME);
     protected static final DimParticipant PLATO = configureParticipant(PLATO_NAME);

diff --git a/...sts/transfer/DimHttpPullTransferTest.java → ...r/DimHttpPullTransferIntegrationTest.java b/...sts/transfer/DimHttpPullTransferTest.java → ...r/DimHttpPullTransferIntegrationTest.java
@@ -22,7 +22,7 @@
 import org.eclipse.tractusx.edc.lifecycle.DimParticipant;
 import org.eclipse.tractusx.edc.lifecycle.ParticipantRuntime;
 import org.eclipse.tractusx.edc.tag.DimIntegrationTest;
-import org.eclipse.tractusx.edc.tests.TractusxParticipantBase;
+import org.eclipse.tractusx.edc.tests.participant.TractusxParticipantBase;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -33,7 +33,7 @@
 
 @DimIntegrationTest
 @Disabled
-public class DimHttpPullTransferTest extends HttpConsumerPullBaseTest {
+public class DimHttpPullTransferIntegrationTest extends HttpConsumerPullBaseTest {
 
     protected static final DimParticipant SOKRATES = configureParticipant(SOKRATES_NAME);
     protected static final DimParticipant PLATO = configureParticipant(PLATO_NAME);
@@ -45,12 +45,12 @@ public class DimHttpPullTransferTest extends HttpConsumerPullBaseTest {
     protected static final ParticipantRuntime SOKRATES_RUNTIME = dimRuntime(SOKRATES.getName(), SOKRATES.iatpConfiguration(PLATO));
 
     @Override
-    protected TractusxParticipantBase plato() {
+    public TractusxParticipantBase plato() {
         return PLATO;
     }
 
     @Override
-    protected TractusxParticipantBase sokrates() {
+    public TractusxParticipantBase sokrates() {
         return SOKRATES;
     }
 }
diff --git a/...talog-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/AbstractCatalogTest.java b/...talog-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/AbstractCatalogTest.java
diff --git a/...talog-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/CatalogInMemoryTest.java b/...talog-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/CatalogInMemoryTest.java
diff --git a/...log-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/CatalogPostgresqlTest.java b/...log-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/CatalogPostgresqlTest.java