Merge pull request #57 from /issues/22-test-coverage-katta-services-part-2

Test coverage katta services (part II).

Author: dkocher

hub/src/test/java/ch/iterate/hub/workflows/CachingUserKeysServiceTest.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2025 shift7 GmbH. All rights reserved.
+ */
+
+package ch.iterate.hub.workflows;
+
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import ch.iterate.hub.client.ApiException;
+import ch.iterate.hub.crypto.UserKeys;
+import ch.iterate.hub.workflows.exceptions.AccessException;
+import ch.iterate.hub.workflows.exceptions.SecurityFailure;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.times;
+
+class CachingUserKeysServiceTest {
+
+    @Test
+    void testGetUserKeys() throws AccessException, SecurityFailure, ApiException {
+        final UserKeysService proxyMock = Mockito.mock(UserKeysService.class);
+        final UserKeys userKeys = UserKeys.create();
+        Mockito.when(proxyMock.getUserKeys(any(), any())).thenReturn(userKeys);
+        final CachingUserKeysService service = new CachingUserKeysService(proxyMock);
+        assertEquals(userKeys, service.getUserKeys(null, null));
+        Mockito.verify(proxyMock, times(1)).getUserKeys(any(), any());
+        assertEquals(userKeys, service.getUserKeys(null, null));
+        Mockito.verify(proxyMock, times(1)).getUserKeys(any(), any());
+    }
+}

hub/src/test/java/ch/iterate/hub/workflows/CachingWoTServiceTest.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2025 shift7 GmbH. All rights reserved.
+ */
+
+package ch.iterate.hub.workflows;
+
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import java.text.ParseException;
+import java.util.HashMap;
+
+import ch.iterate.hub.client.ApiException;
+import ch.iterate.hub.client.model.TrustedUserDto;
+import ch.iterate.hub.workflows.exceptions.AccessException;
+import ch.iterate.hub.workflows.exceptions.SecurityFailure;
+import com.nimbusds.jose.JOSEException;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.times;
+
+class CachingWoTServiceTest {
+
+    @Test
+    void testGetTrustLevelsPerUserId() throws AccessException, SecurityFailure, ApiException {
+        final WoTService proxyMock = Mockito.mock(WoTService.class);
+        final HashMap<String, Integer> trustLevels = new HashMap<String, Integer>() {{
+            put("alkdajf", 5);
+            put("lakdjfa", 42);
+        }};
+        Mockito.when(proxyMock.getTrustLevelsPerUserId(any())).thenReturn(trustLevels);
+        final CachingWoTService service = new CachingWoTService(proxyMock);
+        assertEquals(trustLevels, service.getTrustLevelsPerUserId(null));
+        Mockito.verify(proxyMock, times(1)).getTrustLevelsPerUserId(any());
+        assertEquals(trustLevels, service.getTrustLevelsPerUserId(null));
+        Mockito.verify(proxyMock, times(1)).getTrustLevelsPerUserId(any());
+    }
+
+    @Test
+    void testVerify() throws AccessException, SecurityFailure, ApiException {
+        final WoTService proxyMock = Mockito.mock(WoTService.class);
+        final CachingWoTService service = new CachingWoTService(proxyMock);
+        service.verify(null, null, null);
+        Mockito.verify(proxyMock, times(1)).verify(any(), any(), any());
+        service.verify(null, null, null);
+        Mockito.verify(proxyMock, times(2)).verify(any(), any(), any());
+    }
+
+    @Test
+    void testSign() throws AccessException, SecurityFailure, ParseException, JOSEException, ApiException {
+        final WoTService proxyMock = Mockito.mock(WoTService.class);
+        final TrustedUserDto trustedUser = new TrustedUserDto();
+        Mockito.when(proxyMock.sign(any(), any())).thenReturn(trustedUser);
+        final CachingWoTService service = new CachingWoTService(proxyMock);
+        assertEquals(trustedUser, service.sign(null, null));
+        Mockito.verify(proxyMock, times(1)).sign(any(), any());
+        assertEquals(trustedUser, service.sign(null, null));
+        Mockito.verify(proxyMock, times(2)).sign(any(), any());
+    }
+}

hub/src/test/java/ch/iterate/hub/workflows/WoTServiceImplTest.java

@@ -4,8 +4,6 @@
 
 package ch.iterate.hub.workflows;
 
-import ch.cyberduck.core.Host;
-
 import org.cryptomator.cryptolib.common.P384KeyPair;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
@@ -38,7 +36,7 @@
 class WoTServiceImplTest {
 
     @Test
-    void getTrustLevelsPerUserId() throws ParseException, JOSEException, ApiException, AccessException, SecurityFailure {
+    void testGetTrustLevelsPerUserId() throws ParseException, JOSEException, ApiException, AccessException, SecurityFailure {
         final List<String> bobSignatureChain = new LinkedList<>();
         int len = 5;
 
@@ -86,17 +84,15 @@ void getTrustLevelsPerUserId() throws ParseException, JOSEException, ApiExceptio
 
         final UsersResourceApi usersMock = Mockito.mock(UsersResourceApi.class);
         final WoTServiceImpl wot = new WoTServiceImpl(usersMock);
-        final Host hub = Mockito.mock(Host.class);
         Mockito.when(usersMock.apiUsersMeGet(true)).thenReturn(alice);
         Mockito.when(usersMock.apiUsersGet()).thenReturn(Arrays.asList(alice, bob, oscar));
         Mockito.when(usersMock.apiUsersTrustedGet()).thenReturn(Arrays.asList(bobTrust, oscarTrust));
 
         assertEquals(Collections.singletonMap(bob.getId(), 5), wot.getTrustLevelsPerUserId(aliceKeys));
     }
 
-
     @Test
-    void verify() throws ParseException, JOSEException, ApiException, AccessException, SecurityFailure {
+    void testVerify() throws ParseException, JOSEException, ApiException, AccessException, SecurityFailure {
         final List<String> signatureChain = new LinkedList<>();
         int len = 5;
 
@@ -106,9 +102,9 @@ void verify() throws ParseException, JOSEException, ApiException, AccessExceptio
                 .name("bob")
                 .ecdhPublicKey(encodePublicKey(bobKeys.ecdhKeyPair().getPublic()))
                 .ecdsaPublicKey(encodePublicKey(bobKeys.ecdsaKeyPair().getPublic()));
+
         UserKeys previousKeys = bobKeys;
         UserDto previousUser = bob;
-
         for(int i = 0; i < len; i++) {
             final UserKeys userKeys = UserKeys.create();
             final UserDto user = new UserDto()
@@ -126,7 +122,6 @@ void verify() throws ParseException, JOSEException, ApiException, AccessExceptio
         final UserKeys aliceKeys = previousKeys;
 
         final UsersResourceApi usersMock = Mockito.mock(UsersResourceApi.class);
-        final Host hub = Mockito.mock(Host.class);
         Mockito.when(usersMock.apiUsersMeGet(true)).thenReturn(alice);
 
         final WoTServiceImpl wot = new WoTServiceImpl(usersMock);
@@ -135,7 +130,7 @@ void verify() throws ParseException, JOSEException, ApiException, AccessExceptio
     }
 
     @Test
-    void sign() throws ApiException, ParseException, JOSEException, AccessException, SecurityFailure {
+    void testSign() throws ApiException, ParseException, JOSEException, AccessException, SecurityFailure {
         final UserKeys aliceKeys = UserKeys.create();
         final P384KeyPair bobEcdhKeys = P384KeyPair.generate();
         final P384KeyPair bobEcdsaKeys = P384KeyPair.generate();
@@ -148,7 +143,6 @@ void sign() throws ApiException, ParseException, JOSEException, AccessException,
         final String expectedSignature = WoT.sign(aliceKeys.ecdsaKeyPair().getPrivate(), alice.getId(), bob);
 
         final UsersResourceApi usersMock = Mockito.mock(UsersResourceApi.class);
-        final Host hub = Mockito.mock(Host.class);
         Mockito.when(usersMock.apiUsersMeGet(true)).thenReturn(alice);
         final WoTServiceImpl wot = new WoTServiceImpl(usersMock);
         final TrustedUserDto expectedTrust = new TrustedUserDto().trustedUserId(bob.getId()).signatureChain(Collections.singletonList(expectedSignature));
@@ -158,4 +152,4 @@ void sign() throws ApiException, ParseException, JOSEException, AccessException,
         Mockito.verify(usersMock, times(1)).apiUsersTrustedUserIdPut(eq(bob.getId()), anyString());
         assertEquals(expectedTrust, trust);
     }
-}
+}