From 389500dc43568b042dc5d2a1c248dd6811267f51 Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger Date: Thu, 22 Jun 2023 22:12:19 +0200 Subject: [PATCH] fix: compile errors --- .../verifier/OnboardingPolicyVerifierImplTest.java | 8 ++++---- .../registration/client/RegistrationServiceTestUtils.java | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/core/registration-service-onboarding-policy-verifier/src/test/java/org/eclipse/edc/registration/verifier/OnboardingPolicyVerifierImplTest.java b/core/registration-service-onboarding-policy-verifier/src/test/java/org/eclipse/edc/registration/verifier/OnboardingPolicyVerifierImplTest.java index 18a62767..0d4b0309 100644 --- a/core/registration-service-onboarding-policy-verifier/src/test/java/org/eclipse/edc/registration/verifier/OnboardingPolicyVerifierImplTest.java +++ b/core/registration-service-onboarding-policy-verifier/src/test/java/org/eclipse/edc/registration/verifier/OnboardingPolicyVerifierImplTest.java @@ -22,6 +22,7 @@ import org.eclipse.edc.policy.engine.spi.PolicyEngine; import org.eclipse.edc.policy.model.Policy; import org.eclipse.edc.registration.spi.registration.DataspaceRegistrationPolicy; +import org.eclipse.edc.spi.agent.ParticipantAgent; import org.eclipse.edc.spi.monitor.Monitor; import org.eclipse.edc.spi.response.ResponseStatus; import org.eclipse.edc.spi.result.Result; @@ -74,9 +75,8 @@ void beforeEach() { @Test void isOnboardingAllowed_success() { - when(policyEngine.evaluate(eq(PARTICIPANT_REGISTRATION_SCOPE), eq(policy), argThat(a -> - verifiableCredentials.equals(a.getClaims()) && - Map.of().equals(a.getAttributes())))) + when(policyEngine.evaluate(eq(PARTICIPANT_REGISTRATION_SCOPE), eq(policy), (argThat((ParticipantAgent a) -> verifiableCredentials.equals(a.getClaims()) && + Map.of().equals(a.getAttributes()))))) .thenReturn(Result.success(policyResult)); var result = verifier.isOnboardingAllowed(participantDid); @@ -105,7 +105,7 @@ void isOnboardingAllowed_whenPushToIdentityHubFails_fails() { @Test void isOnboardingAllowed_whenNotAllowedByPolicy_returnsFalse() { - when(policyEngine.evaluate(any(), any(), any())) + when(policyEngine.evaluate(any(), any(), any(ParticipantAgent.class))) .thenReturn(Result.failure(failure)); var result = verifier.isOnboardingAllowed(participantDid); diff --git a/system-tests/src/test/java/org/eclipse/edc/registration/client/RegistrationServiceTestUtils.java b/system-tests/src/test/java/org/eclipse/edc/registration/client/RegistrationServiceTestUtils.java index a1e9406f..09018fc6 100644 --- a/system-tests/src/test/java/org/eclipse/edc/registration/client/RegistrationServiceTestUtils.java +++ b/system-tests/src/test/java/org/eclipse/edc/registration/client/RegistrationServiceTestUtils.java @@ -18,7 +18,6 @@ import com.nimbusds.jose.jwk.ECKey; import org.eclipse.edc.iam.did.spi.document.DidConstants; import org.eclipse.edc.iam.did.spi.document.DidDocument; -import org.eclipse.edc.iam.did.spi.document.EllipticCurvePublicKey; import org.eclipse.edc.iam.did.spi.document.Service; import org.eclipse.edc.iam.did.spi.document.VerificationMethod; import org.eclipse.edc.registration.cli.ClientUtils; @@ -47,7 +46,7 @@ static String didDocument() throws Exception { .id("#my-key-1") .type(DidConstants.ECDSA_SECP_256_K_1_VERIFICATION_KEY_2019) .controller("") - .publicKeyJwk(new EllipticCurvePublicKey(publicKey.getCurve().getName(), publicKey.getKeyType().getValue(), publicKey.getX().toString(), publicKey.getY().toString())) + .publicKeyJwk(publicKey.toJSONObject()) .build(); var didDocument = DidDocument.Builder.newInstance() .verificationMethod(List.of(vm))