Skip to content

Commit fd48a1a

Browse files
wolf4oodwolf4ood
authored
chore: remove test fixtures (#184)
1 parent 4282ebe commit fd48a1a

39 files changed

Lines changed: 50 additions & 2250 deletions

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ edc-bom-dataplane = { module = "org.eclipse.edc:dataplane-base-bom", version.ref
126126

127127
## EDC Fixtures
128128
edc-fixtures-sql = { module = "org.eclipse.edc:sql-test-fixtures", version.ref = "edc" }
129+
edc-fixtures-mgmtapi = { module = "org.eclipse.edc:management-api-test-fixtures", version.ref = "edc" }
129130

130131
### IH for testing
131132
edc-ih-test-fixtures = { module = "org.eclipse.edc:identityhub-test-fixtures", version.ref = "edc" }

‎system-tests/runtime-tests/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ dependencies {
4141
exclude("com.networknt", "json-schema-validator")
4242
}
4343
testImplementation(testFixtures(libs.edc.lib.oauth2.authn))
44+
testImplementation(testFixtures(libs.edc.fixtures.mgmtapi))
4445
testImplementation(libs.nimbus.jwt)
4546
testImplementation(libs.bouncyCastle.bcpkixJdk18on)
4647

‎system-tests/runtime-tests/src/test/java/org/eclipse/edc/virtual/transfer/DcpTransferPullEndToEndTest.java‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,21 @@
1616

1717
import org.eclipse.edc.api.authentication.OauthServerEndToEndExtension;
1818
import org.eclipse.edc.connector.controlplane.contract.spi.types.negotiation.ContractNegotiationStates;
19+
import org.eclipse.edc.connector.controlplane.test.system.utils.Participants;
20+
import org.eclipse.edc.connector.controlplane.test.system.utils.client.ManagementApiClientV5;
21+
import org.eclipse.edc.connector.controlplane.test.system.utils.client.api.model.AssetDto;
22+
import org.eclipse.edc.connector.controlplane.test.system.utils.client.api.model.AtomicConstraintDto;
23+
import org.eclipse.edc.connector.controlplane.test.system.utils.client.api.model.CelExpressionDto;
24+
import org.eclipse.edc.connector.controlplane.test.system.utils.client.api.model.DataAddressDto;
25+
import org.eclipse.edc.connector.controlplane.test.system.utils.client.api.model.PermissionDto;
26+
import org.eclipse.edc.connector.controlplane.test.system.utils.client.api.model.PolicyDefinitionDto;
27+
import org.eclipse.edc.connector.controlplane.test.system.utils.client.api.model.PolicyDto;
1928
import org.eclipse.edc.identityhub.tests.fixtures.DefaultRuntimes;
2029
import org.eclipse.edc.identityhub.tests.fixtures.credentialservice.IdentityHub;
2130
import org.eclipse.edc.identityhub.tests.fixtures.credentialservice.IdentityHubApiClient;
2231
import org.eclipse.edc.identityhub.tests.fixtures.issuerservice.IssuerService;
2332
import org.eclipse.edc.junit.annotations.PostgresqlIntegrationTest;
33+
import org.eclipse.edc.junit.extensions.ComponentRuntimeContext;
2434
import org.eclipse.edc.junit.extensions.ComponentRuntimeExtension;
2535
import org.eclipse.edc.junit.extensions.RuntimeExtension;
2636
import org.eclipse.edc.junit.utils.Endpoints;
@@ -29,16 +39,7 @@
2939
import org.eclipse.edc.spi.system.configuration.ConfigFactory;
3040
import org.eclipse.edc.sql.testfixtures.PostgresqlEndToEndExtension;
3141
import org.eclipse.edc.virtual.Runtimes;
32-
import org.eclipse.edc.virtual.transfer.fixtures.Participants;
3342
import org.eclipse.edc.virtual.transfer.fixtures.VirtualConnector;
34-
import org.eclipse.edc.virtual.transfer.fixtures.VirtualConnectorClient;
35-
import org.eclipse.edc.virtual.transfer.fixtures.api.model.AssetDto;
36-
import org.eclipse.edc.virtual.transfer.fixtures.api.model.AtomicConstraintDto;
37-
import org.eclipse.edc.virtual.transfer.fixtures.api.model.CelExpressionDto;
38-
import org.eclipse.edc.virtual.transfer.fixtures.api.model.DataAddressDto;
39-
import org.eclipse.edc.virtual.transfer.fixtures.api.model.PermissionDto;
40-
import org.eclipse.edc.virtual.transfer.fixtures.api.model.PolicyDefinitionDto;
41-
import org.eclipse.edc.virtual.transfer.fixtures.api.model.PolicyDto;
4243
import org.junit.jupiter.api.BeforeAll;
4344
import org.junit.jupiter.api.Nested;
4445
import org.junit.jupiter.api.Order;
@@ -63,14 +64,16 @@ class DcpTransferPullEndToEndTest {
6364
public static final String PROVIDER_CONTEXT = "provider";
6465
public static final String CONSUMER_CONTEXT = "consumer";
6566

66-
private static Participants participants(Endpoints endpoints) {
67+
private static Participants participants(ComponentRuntimeContext ctx, Endpoints endpoints) {
68+
var protocolEndpoint = ctx.getEndpoint("protocol");
69+
var signalingEndpoint = ctx.getEndpoint("signaling");
6770
var providerDid = Runtimes.IdentityHub.didFor(endpoints, PROVIDER_CONTEXT);
6871
var providerCfg = Runtimes.IdentityHub.dcpConfig(endpoints, PROVIDER_CONTEXT);
6972
var consumerDid = Runtimes.IdentityHub.didFor(endpoints, CONSUMER_CONTEXT);
7073
var consumerCfg = Runtimes.IdentityHub.dcpConfig(endpoints, CONSUMER_CONTEXT);
7174
return new Participants(
72-
new Participants.Participant(PROVIDER_CONTEXT, providerDid, providerCfg.getEntries()),
73-
new Participants.Participant(CONSUMER_CONTEXT, consumerDid, consumerCfg.getEntries())
75+
new Participants.Participant(PROVIDER_CONTEXT, providerDid, protocolEndpoint, signalingEndpoint, providerCfg.getEntries()),
76+
new Participants.Participant(CONSUMER_CONTEXT, consumerDid, protocolEndpoint, signalingEndpoint, consumerCfg.getEntries())
7477
);
7578
}
7679

@@ -112,7 +115,7 @@ static void setup(IssuerService issuer,
112115

113116
@Test
114117
void httpPull_dataTransfer_withMembershipExpression(VirtualConnector env,
115-
VirtualConnectorClient connectorClient,
118+
ManagementApiClientV5 connectorClient,
116119
Participants participants) {
117120

118121
var leftOperand = "https://w3id.org/example/credentials/MembershipCredential";
@@ -142,7 +145,7 @@ void httpPull_dataTransfer_withMembershipExpression(VirtualConnector env,
142145
}
143146

144147
@Test
145-
void negotiation_fails_withMissingCredential(VirtualConnector env, VirtualConnectorClient connectorClient,
148+
void negotiation_fails_withMissingCredential(VirtualConnector env, ManagementApiClientV5 connectorClient,
146149
Participants participants) {
147150

148151
var leftOperand = "https://w3id.org/example/credentials/DataAccessCredential";
@@ -170,7 +173,7 @@ void negotiation_fails_withMissingCredential(VirtualConnector env, VirtualConnec
170173

171174
}
172175

173-
private String setup(VirtualConnectorClient connectorClient, Participants.Participant provider, PolicyDto policy) {
176+
private String setup(ManagementApiClientV5 connectorClient, Participants.Participant provider, PolicyDto policy) {
174177
var asset = new AssetDto(new DataAddressDto("HttpData"));
175178
var policyDef = new PolicyDefinitionDto(policy);
176179

@@ -244,8 +247,8 @@ class Postgres extends DcpTransferPullEndToEndTestBase {
244247
.configurationProvider(AUTH_SERVER_EXTENSION::getConfig)
245248
.configurationProvider(() -> ConfigFactory.fromMap(Map.of("edc.iam.did.web.use.https", "false")))
246249
.paramProvider(VirtualConnector.class, VirtualConnector::forContext)
247-
.paramProvider(VirtualConnectorClient.class, (ctx) -> VirtualConnectorClient.forContext(ctx, AUTH_SERVER_EXTENSION.getAuthServer()))
248-
.paramProvider(Participants.class, context -> participants(IDENTITY_HUB_ENDPOINTS))
250+
.paramProvider(ManagementApiClientV5.class, (ctx) -> ManagementApiClientV5.forContext(ctx, AUTH_SERVER_EXTENSION.getAuthServer()))
251+
.paramProvider(Participants.class, context -> participants(context, IDENTITY_HUB_ENDPOINTS))
249252
.build();
250253

251254
private static Config runtimeConfiguration() {

‎system-tests/runtime-tests/src/test/java/org/eclipse/edc/virtual/transfer/TransferPullEndToEndTest.java‎

Lines changed: 12 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,17 @@
1515
package org.eclipse.edc.virtual.transfer;
1616

1717
import org.eclipse.edc.api.authentication.OauthServerEndToEndExtension;
18+
import org.eclipse.edc.connector.controlplane.test.system.utils.Participants;
19+
import org.eclipse.edc.connector.controlplane.test.system.utils.client.ManagementApiClientV5;
1820
import org.eclipse.edc.junit.annotations.EndToEndTest;
1921
import org.eclipse.edc.junit.annotations.PostgresqlIntegrationTest;
22+
import org.eclipse.edc.junit.extensions.ComponentRuntimeContext;
2023
import org.eclipse.edc.junit.extensions.ComponentRuntimeExtension;
2124
import org.eclipse.edc.junit.extensions.RuntimeExtension;
2225
import org.eclipse.edc.nats.testfixtures.NatsEndToEndExtension;
2326
import org.eclipse.edc.sql.testfixtures.PostgresqlEndToEndExtension;
2427
import org.eclipse.edc.virtual.Runtimes;
25-
import org.eclipse.edc.virtual.transfer.fixtures.Participants;
2628
import org.eclipse.edc.virtual.transfer.fixtures.VirtualConnector;
27-
import org.eclipse.edc.virtual.transfer.fixtures.VirtualConnectorClient;
2829
import org.junit.jupiter.api.Nested;
2930
import org.junit.jupiter.api.Order;
3031
import org.junit.jupiter.api.extension.BeforeAllCallback;
@@ -40,10 +41,12 @@ class TransferPullEndToEndTest {
4041
public static final String PROVIDER_ID = "provider-id";
4142
public static final String CONSUMER_ID = "consumer-id";
4243

43-
private static Participants participants() {
44+
private static Participants participants(ComponentRuntimeContext ctx) {
45+
var protocolEndpoint = ctx.getEndpoint("protocol");
46+
var signalingEndpoint = ctx.getEndpoint("signaling");
4447
return new Participants(
45-
new Participants.Participant(PROVIDER_CONTEXT, PROVIDER_ID),
46-
new Participants.Participant(CONSUMER_CONTEXT, CONSUMER_ID)
48+
new Participants.Participant(PROVIDER_CONTEXT, PROVIDER_ID, protocolEndpoint, signalingEndpoint),
49+
new Participants.Participant(CONSUMER_CONTEXT, CONSUMER_ID, protocolEndpoint, signalingEndpoint)
4750
);
4851
}
4952

@@ -63,8 +66,8 @@ class InMemory extends TransferPullEndToEndTestBase {
6366
.configurationProvider(Runtimes.ControlPlane::config)
6467
.configurationProvider(AUTH_SERVER_EXTENSION::getConfig)
6568
.paramProvider(VirtualConnector.class, VirtualConnector::forContext)
66-
.paramProvider(VirtualConnectorClient.class, (ctx) -> VirtualConnectorClient.forContext(ctx, AUTH_SERVER_EXTENSION.getAuthServer()))
67-
.paramProvider(Participants.class, context -> participants())
69+
.paramProvider(ManagementApiClientV5.class, (ctx) -> ManagementApiClientV5.forContext(ctx, AUTH_SERVER_EXTENSION.getAuthServer()))
70+
.paramProvider(Participants.class, TransferPullEndToEndTest::participants)
6871
.build();
6972

7073
}
@@ -99,45 +102,8 @@ class Postgres extends TransferPullEndToEndTestBase {
99102
.configurationProvider(NATS_EXTENSION::configFor)
100103
.configurationProvider(AUTH_SERVER_EXTENSION::getConfig)
101104
.paramProvider(VirtualConnector.class, VirtualConnector::forContext)
102-
.paramProvider(VirtualConnectorClient.class, (ctx) -> VirtualConnectorClient.forContext(ctx, AUTH_SERVER_EXTENSION.getAuthServer()))
103-
.paramProvider(Participants.class, context -> participants())
104-
.build();
105-
106-
}
107-
108-
@Nested
109-
@PostgresqlIntegrationTest
110-
class PostgresNatsTasks extends TransferPullEndToEndTestBase {
111-
112-
@Order(0)
113-
@RegisterExtension
114-
static final OauthServerEndToEndExtension AUTH_SERVER_EXTENSION = OauthServerEndToEndExtension.Builder.newInstance().build();
115-
116-
@Order(0)
117-
@RegisterExtension
118-
static final NatsEndToEndExtension NATS_EXTENSION = new NatsEndToEndExtension();
119-
@Order(0)
120-
@RegisterExtension
121-
static final PostgresqlEndToEndExtension POSTGRESQL_EXTENSION = new PostgresqlEndToEndExtension(createPgContainer());
122-
@Order(1)
123-
@RegisterExtension
124-
static final BeforeAllCallback SETUP = context -> {
125-
POSTGRESQL_EXTENSION.createDatabase(Runtimes.ControlPlane.NAME.toLowerCase());
126-
};
127-
128-
@Order(2)
129-
@RegisterExtension
130-
static final RuntimeExtension CONTROL_PLANE = ComponentRuntimeExtension.Builder.newInstance()
131-
.name(Runtimes.ControlPlane.NAME)
132-
.modules(Runtimes.ControlPlane.PG_NATS_TASKS_MODULES)
133-
.endpoints(Runtimes.ControlPlane.ENDPOINTS.build())
134-
.configurationProvider(Runtimes.ControlPlane::config)
135-
.configurationProvider(() -> POSTGRESQL_EXTENSION.configFor(Runtimes.ControlPlane.NAME.toLowerCase()))
136-
.configurationProvider(NATS_EXTENSION::configFor)
137-
.configurationProvider(AUTH_SERVER_EXTENSION::getConfig)
138-
.paramProvider(VirtualConnector.class, VirtualConnector::forContext)
139-
.paramProvider(VirtualConnectorClient.class, (ctx) -> VirtualConnectorClient.forContext(ctx, AUTH_SERVER_EXTENSION.getAuthServer()))
140-
.paramProvider(Participants.class, context -> participants())
105+
.paramProvider(ManagementApiClientV5.class, (ctx) -> ManagementApiClientV5.forContext(ctx, AUTH_SERVER_EXTENSION.getAuthServer()))
106+
.paramProvider(Participants.class, TransferPullEndToEndTest::participants)
141107
.build();
142108

143109
}

‎system-tests/runtime-tests/src/test/java/org/eclipse/edc/virtual/transfer/TransferPullEndToEndTestBase.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@
1919
import com.nimbusds.jose.jwk.Curve;
2020
import com.nimbusds.jose.jwk.gen.ECKeyGenerator;
2121
import org.eclipse.edc.connector.controlplane.services.spi.transferprocess.TransferProcessService;
22+
import org.eclipse.edc.connector.controlplane.test.system.utils.Participants;
23+
import org.eclipse.edc.connector.controlplane.test.system.utils.client.ManagementApiClientV5;
24+
import org.eclipse.edc.connector.controlplane.test.system.utils.client.api.model.AssetDto;
25+
import org.eclipse.edc.connector.controlplane.test.system.utils.client.api.model.DataAddressDto;
26+
import org.eclipse.edc.connector.controlplane.test.system.utils.client.api.model.PermissionDto;
27+
import org.eclipse.edc.connector.controlplane.test.system.utils.client.api.model.PolicyDefinitionDto;
28+
import org.eclipse.edc.connector.controlplane.test.system.utils.client.api.model.PolicyDto;
2229
import org.eclipse.edc.connector.dataplane.spi.Endpoint;
2330
import org.eclipse.edc.connector.dataplane.spi.iam.PublicEndpointGeneratorService;
2431
import org.eclipse.edc.junit.annotations.Runtime;
2532
import org.eclipse.edc.spi.EdcException;
2633
import org.eclipse.edc.spi.security.Vault;
2734
import org.eclipse.edc.virtual.Runtimes.ControlPlane;
28-
import org.eclipse.edc.virtual.transfer.fixtures.Participants;
2935
import org.eclipse.edc.virtual.transfer.fixtures.VirtualConnector;
30-
import org.eclipse.edc.virtual.transfer.fixtures.VirtualConnectorClient;
31-
import org.eclipse.edc.virtual.transfer.fixtures.api.model.AssetDto;
32-
import org.eclipse.edc.virtual.transfer.fixtures.api.model.DataAddressDto;
33-
import org.eclipse.edc.virtual.transfer.fixtures.api.model.PermissionDto;
34-
import org.eclipse.edc.virtual.transfer.fixtures.api.model.PolicyDefinitionDto;
35-
import org.eclipse.edc.virtual.transfer.fixtures.api.model.PolicyDto;
3636
import org.junit.jupiter.api.BeforeAll;
3737
import org.junit.jupiter.api.Test;
3838
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -56,7 +56,7 @@ abstract class TransferPullEndToEndTestBase {
5656

5757
@BeforeAll
5858
static void beforeAll(PublicEndpointGeneratorService generatorService,
59-
VirtualConnectorClient connectorClient,
59+
ManagementApiClientV5 connectorClient,
6060
Participants participants,
6161
@Runtime(ControlPlane.NAME) Vault vault) {
6262
generatorService.addGeneratorFunction("HttpData", address -> Endpoint.url("http://example.com"));
@@ -78,7 +78,7 @@ static void beforeAll(PublicEndpointGeneratorService generatorService,
7878
}
7979

8080
@Test
81-
void transfer(VirtualConnector env, VirtualConnectorClient connectorClient, Participants participants) {
81+
void transfer(VirtualConnector env, ManagementApiClientV5 connectorClient, Participants participants) {
8282
var providerAddress = env.getProtocolEndpoint().get() + "/" + participants.provider().contextId() + "/2025-1";
8383

8484
var assetId = setup(connectorClient, participants.provider());
@@ -92,7 +92,7 @@ void transfer(VirtualConnector env, VirtualConnectorClient connectorClient, Part
9292
}
9393

9494
@Test
95-
void suspendAndResumeByProvider(VirtualConnector env, VirtualConnectorClient connectorClient, Participants participants) {
95+
void suspendAndResumeByProvider(VirtualConnector env, ManagementApiClientV5 connectorClient, Participants participants) {
9696
var providerAddress = env.getProtocolEndpoint().get() + "/" + participants.provider().contextId() + "/2025-1";
9797

9898
var assetId = setup(connectorClient, participants.provider());
@@ -116,7 +116,7 @@ void suspendAndResumeByProvider(VirtualConnector env, VirtualConnectorClient con
116116
}
117117

118118
@Test
119-
void suspendAndResumeByConsumer(VirtualConnector env, VirtualConnectorClient connectorClient, Participants participants) {
119+
void suspendAndResumeByConsumer(VirtualConnector env, ManagementApiClientV5 connectorClient, Participants participants) {
120120
var providerAddress = env.getProtocolEndpoint().get() + "/" + participants.provider().contextId() + "/2025-1";
121121

122122
var assetId = setup(connectorClient, participants.provider());
@@ -139,7 +139,7 @@ void suspendAndResumeByConsumer(VirtualConnector env, VirtualConnectorClient con
139139
}
140140

141141
@Test
142-
void terminateByConsumer(VirtualConnector env, VirtualConnectorClient connectorClient, Participants participants) {
142+
void terminateByConsumer(VirtualConnector env, ManagementApiClientV5 connectorClient, Participants participants) {
143143
var providerAddress = env.getProtocolEndpoint().get() + "/" + participants.provider().contextId() + "/2025-1";
144144

145145
var assetId = setup(connectorClient, participants.provider());
@@ -158,7 +158,7 @@ void terminateByConsumer(VirtualConnector env, VirtualConnectorClient connectorC
158158
}
159159

160160
@Test
161-
void terminateByProvider(VirtualConnector env, VirtualConnectorClient connectorClient, Participants participants) {
161+
void terminateByProvider(VirtualConnector env, ManagementApiClientV5 connectorClient, Participants participants) {
162162
var providerAddress = env.getProtocolEndpoint().get() + "/" + participants.provider().contextId() + "/2025-1";
163163

164164
var assetId = setup(connectorClient, participants.provider());
@@ -177,7 +177,7 @@ void terminateByProvider(VirtualConnector env, VirtualConnectorClient connectorC
177177
}
178178

179179
@Test
180-
void completeByProvider(VirtualConnector env, TransferProcessService service, VirtualConnectorClient connectorClient, Participants participants) {
180+
void completeByProvider(VirtualConnector env, TransferProcessService service, ManagementApiClientV5 connectorClient, Participants participants) {
181181
var providerAddress = env.getProtocolEndpoint().get() + "/" + participants.provider().contextId() + "/2025-1";
182182

183183
var assetId = setup(connectorClient, participants.provider());
@@ -198,7 +198,7 @@ void completeByProvider(VirtualConnector env, TransferProcessService service, Vi
198198
}
199199

200200
@Test
201-
void completeByConsumer(VirtualConnector env, TransferProcessService service, VirtualConnectorClient connectorClient, Participants participants) {
201+
void completeByConsumer(VirtualConnector env, TransferProcessService service, ManagementApiClientV5 connectorClient, Participants participants) {
202202
var providerAddress = env.getProtocolEndpoint().get() + "/" + participants.provider().contextId() + "/2025-1";
203203

204204
var assetId = setup(connectorClient, participants.provider());
@@ -218,7 +218,7 @@ void completeByConsumer(VirtualConnector env, TransferProcessService service, Vi
218218

219219
}
220220

221-
private String setup(VirtualConnectorClient connectorClient, Participants.Participant provider) {
221+
private String setup(ManagementApiClientV5 connectorClient, Participants.Participant provider) {
222222
var asset = new AssetDto(new DataAddressDto("HttpData"));
223223

224224
var permissions = List.of(new PermissionDto());

0 commit comments

Comments
 (0)