Updated test

IABTechLab · Oct 5, 2023 · d10f25d · d10f25d
1 parent 9ba5fa5
commit d10f25d
Showing 1 changed file with 47 additions and 49 deletions.
diff --git a/src/test/java/com/uid2/client/KeyParserTests.java b/src/test/java/com/uid2/client/KeyParserTests.java
@@ -10,6 +10,8 @@
 
 
 public class KeyParserTests {
+    private static final int DEFAULT_TOKEN_EXPIRY_SECONDS = 2592000;
+
     @Test
     public void parseKeyListSharingEndpoint() {
         String s = "{ \"body\": { " +
@@ -39,61 +41,47 @@ public void parseKeyListSharingEndpoint() {
                 "\"status\": \"success\" }";
 
         KeyContainer keyContainer = parse(s);
+
+        assertEquals(11, keyContainer.getCallerSiteId());
+        assertEquals(1728000, keyContainer.getTokenExpirySeconds());
+
         Key masterKey = keyContainer.getMasterKey(Instant.now());
+        assertNotNull(masterKey);
+        assertEquals(2, masterKey.getId());
+
         Key defaultKey = keyContainer.getDefaultKey(Instant.now());
+        assertNotNull(defaultKey);
+        assertEquals(3, defaultKey.getId());
+
         Key key3 = keyContainer.getKey(3);
-        Key key2 = keyContainer.getKey(2);
+        assertNotNull(key3);
+        assertEquals(99999, key3.getKeysetId());
+        assertEquals(Instant.ofEpochSecond(1609459200), key3.getCreated());
+        assertEquals(Instant.ofEpochSecond(1609459210), key3.getActivates());
+        assertEquals(Instant.ofEpochSecond(1893456000), key3.getExpires());
+        assertEquals("o8HsvkwJ5Ulnrd0uui3GpukpwDapj+JLqb7qfN/GJKo=", InputUtil.byteArrayToBase64(key3.getSecret()));
 
-        assertAll(
-                "parseKeyListSharingEndpoint",
-                () -> assertEquals(11, keyContainer.getCallerSiteId()),
-                () -> assertEquals(1728000, keyContainer.getTokenExpirySeconds()),
-                () -> assertAll(
-                        "parseKeyListSharingEndpoint - masterKey",
-                        () -> assertNotNull(masterKey),
-                        () -> assertEquals(2, masterKey.getId())
-                ),
-                () -> assertAll(
-                        "parseKeyListSharingEndpoint - defaultKey",
-                        () -> assertNotNull(defaultKey),
-                        () -> assertEquals(3, defaultKey.getId())
-                ),
-                () -> assertAll(
-                        "parseKeyListSharingEndpoint - key3",
-                        () -> assertNotNull(key3),
-                        () -> assertEquals(99999, key3.getKeysetId()),
-                        () -> assertEquals(Instant.ofEpochSecond(1609459200), key3.getCreated()),
-                        () -> assertEquals(Instant.ofEpochSecond(1609459210), key3.getActivates()),
-                        () -> assertEquals(Instant.ofEpochSecond(1893456000), key3.getExpires()),
-                        () -> assertEquals("o8HsvkwJ5Ulnrd0uui3GpukpwDapj+JLqb7qfN/GJKo=", InputUtil.byteArrayToBase64(key3.getSecret()))
-                ),
-                () -> assertAll(
-                        "parseKeyListSharingEndpoint - key2",
-                        () -> assertNotNull(key2),
-                        () ->  assertEquals(1, key2.getKeysetId()),
-                        () -> assertEquals(Instant.ofEpochSecond(1609458200), key2.getCreated()),
-                        () -> assertEquals(Instant.ofEpochSecond(1609459220), key2.getActivates()),
-                        () -> assertEquals(Instant.ofEpochSecond(1893457000), key2.getExpires()),
-                        () -> assertEquals("DD67xF8OFmbJ1/lMPQ6fGRDbJOT4kXErrYWcKdFfCUE=", InputUtil.byteArrayToBase64(key2.getSecret()))
-                )
-        );
+        Key key2 = keyContainer.getKey(2);
+        assertNotNull(key2);
+        assertEquals(1, key2.getKeysetId());
+        assertEquals(Instant.ofEpochSecond(1609458200), key2.getCreated());
+        assertEquals(Instant.ofEpochSecond(1609459220), key2.getActivates());
+        assertEquals(Instant.ofEpochSecond(1893457000), key2.getExpires());
+        assertEquals("DD67xF8OFmbJ1/lMPQ6fGRDbJOT4kXErrYWcKdFfCUE=", InputUtil.byteArrayToBase64(key2.getSecret()));
     }
 
     @Test
     public void parseErrorKeyList() {
-        assertAll(
-                "parseErrorKeyList",
-                () -> assertThrows(Exception.class, () -> parse("{\"status\": \"error\"}")),
-                () -> assertThrows(Exception.class, () -> parse("{\"body\": \"error\"}")),
-                () -> assertThrows(Exception.class, () -> parse("{\"body\": [1, 2, 3]}")),
-                () -> assertThrows(Exception.class, () -> parse("{\"body\": [{}]}")),
-                () -> assertThrows(Exception.class, () -> parse("{\"body\": [{\"id\": \"test\"}]}")),
-                () -> assertThrows(Exception.class, () -> parse("{\"body\": [{\"id\": 5}]}"))
-        );
+        assertThrows(Exception.class, () -> parse("{\"status\": \"error\"}"));
+        assertThrows(Exception.class, () -> parse("{\"body\": \"error\"}"));
+        assertThrows(Exception.class, () -> parse("{\"body\": [1, 2, 3]}"));
+        assertThrows(Exception.class, () -> parse("{\"body\": [{}]}"));
+        assertThrows(Exception.class, () -> parse("{\"body\": [{\"id\": \"test\"}]}"));
+        assertThrows(Exception.class, () -> parse("{\"body\": [{\"id\": 5}]}"));
     }
 
     @Test
-    public void parseWithNull() {
+    public void parseWithNullField() {
         String s = "{ \"body\": { " +
                 "\"caller_site_id\": 11, " +
                 "\"token_expiry_seconds\": null " +
@@ -102,11 +90,21 @@ public void parseWithNull() {
 
         KeyContainer keyContainer = parse(s);
 
-        assertAll(
-                "parseWithNull",
-                () -> assertEquals(11, keyContainer.getCallerSiteId()),
-                () -> assertEquals(2592000, keyContainer.getTokenExpirySeconds())
-        );
+        assertEquals(11, keyContainer.getCallerSiteId());
+        assertEquals(DEFAULT_TOKEN_EXPIRY_SECONDS, keyContainer.getTokenExpirySeconds());
+    }
+
+    @Test
+    public void parseWithMissingField() {
+        String s = "{ \"body\": { " +
+                "\"caller_site_id\": 11 " +
+                "}, " +
+                "\"status\": \"success\" }";
+
+        KeyContainer keyContainer = parse(s);
+
+        assertEquals(11, keyContainer.getCallerSiteId());
+        assertEquals(DEFAULT_TOKEN_EXPIRY_SECONDS, keyContainer.getTokenExpirySeconds());
     }
 
     private KeyContainer parse(String str) {