fix: compile errors

eclipse-edc · Jun 22, 2023 · 389500d · 389500d
1 parent 8512bde
commit 389500d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/...src/test/java/org/eclipse/edc/registration/verifier/OnboardingPolicyVerifierImplTest.java b/...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/...tests/src/test/java/org/eclipse/edc/registration/client/RegistrationServiceTestUtils.java b/...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))