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

chore: E2E tests refactor #1169

Merged
merged 1 commit into from
Mar 28, 2024
Merged

chore: E2E tests refactor #1169

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
4 changes: 2 additions & 2 deletions edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/DimParticipant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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());
}
Expand Down
4 changes: 2 additions & 2 deletions edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/MiwParticipant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -29,7 +29,7 @@
* Extension of {@link TractusxParticipantBase} with MIW specific configuration
*/
public class MiwParticipant extends TractusxParticipantBase {

protected String miwUri;
protected String oauth2Uri;

Expand Down
2 changes: 1 addition & 1 deletion ...usx/edc/tests/catalog/DimCatalogTest.java → ...ts/catalog/DimCatalogIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions ...sts/transfer/DimHttpPullTransferTest.java → ...r/DimHttpPullTransferIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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);
Expand All @@ -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;
}
}
205 changes: 0 additions & 205 deletions ...talog-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/AbstractCatalogTest.java
View file
Open in desktop

This file was deleted.

44 changes: 0 additions & 44 deletions ...talog-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/CatalogInMemoryTest.java
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions ...log-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/CatalogPostgresqlTest.java
View file
Open in desktop

This file was deleted.

Loading
Loading