Add more unit tests

Author: caroline-ttd

src/test/java/com/uid2/admin/managers/KeysetManagerTest.java

@@ -174,6 +174,54 @@ public void testCreateKeysetForClient() throws Exception {
         assertEquals(7, keysets.keySet().size());
     }
 
+    @Test
+    public void createAndAddKeyset_nullAllowedSites_storesEmptySetNotNullAndAddsDspWhenTypesNull() throws Exception {
+        setKeysets(new HashMap<>());
+        KeysetManager keysetManager = new KeysetManager(keysetProvider, keysetStoreWriter, keysetKeyManager, true);
+
+        AdminKeyset created = keysetManager.createAndAddKeyset(42, null, null);
+
+        assertNotNull(created.getAllowedSites());
+        assertTrue(created.getAllowedSites().isEmpty());
+        assertEquals(Set.of(ClientType.DSP), created.getAllowedTypes());
+    }
+
+    @Test
+    public void createAndAddKeyset_nullAllowedSites_preservesOtherTypesAndAddsDsp() throws Exception {
+        setKeysets(new HashMap<>());
+        KeysetManager keysetManager = new KeysetManager(keysetProvider, keysetStoreWriter, keysetKeyManager, true);
+
+        AdminKeyset created = keysetManager.createAndAddKeyset(42, null, new HashSet<>(Set.of(ClientType.ADVERTISER)));
+
+        assertNotNull(created.getAllowedSites());
+        assertTrue(created.getAllowedSites().isEmpty());
+        assertTrue(created.getAllowedTypes().contains(ClientType.DSP));
+        assertTrue(created.getAllowedTypes().contains(ClientType.ADVERTISER));
+    }
+
+    @Test
+    public void createKeysetForSite_newKeyset_hasNonNullEmptyAllowedSitesAndDspType() throws Exception {
+        setKeysets(new HashMap<>());
+        KeysetManager keysetManager = new KeysetManager(keysetProvider, keysetStoreWriter, keysetKeyManager, true);
+
+        AdminKeyset created = keysetManager.createKeysetForSite(99);
+
+        assertNotNull(created.getAllowedSites());
+        assertTrue(created.getAllowedSites().isEmpty());
+        assertTrue(created.getAllowedTypes().contains(ClientType.DSP));
+    }
+
+    @Test
+    public void createKeysetForSite_newKeyset_hasEmptyAllowedSitesAndNullType() throws Exception {
+        setKeysets(new HashMap<>());
+        KeysetManager keysetManager = new KeysetManager(keysetProvider, keysetStoreWriter, keysetKeyManager, true);
+
+        AdminKeyset created = keysetManager.createAndAddKeyset(42, new HashSet<>(), null);
+
+        assertNotNull(created.getAllowedSites());
+        assertTrue(created.getAllowedSites().isEmpty());
+        assertNull(created.getAllowedTypes());
+    }
 
     @Test
     public void testLookUpKeyset() {

src/test/java/com/uid2/admin/vertx/SharingServiceTest.java

@@ -51,7 +51,7 @@ private void compareKeysetTypeListToResult(AdminKeyset keyset, JsonArray actualL
                 .collect(Collectors.toSet());
         assertEquals(keyset.getAllowedTypes(), actualSet);
     }
-    
+
     private void mockSiteExistence(Integer... sites){
         for(Integer site : sites) {
             doReturn(new Site(site, "test-name", true, null)).when(siteProvider).getSite(site);
@@ -249,6 +249,37 @@ void listSiteSetNew(Vertx vertx, VertxTestContext testContext) {
         });
     }
 
+    @Test
+    void listSiteSetNewOmittedAllowedSites_emptyAllowedSitesNotNullWithDsp(Vertx vertx, VertxTestContext testContext) {
+        fakeAuth(Role.SHARING_PORTAL);
+
+        Map<Integer, AdminKeyset> keysets = new HashMap<Integer, AdminKeyset>() {{
+            put(3, new AdminKeyset(3, 5, "test", Set.of(4, 6, 7), Instant.now().getEpochSecond(), true, true, new HashSet<>()));
+            put(4, new AdminKeyset(4, 7, "test", Set.of(12), Instant.now().getEpochSecond(), true, true, new HashSet<>()));
+            put(5, new AdminKeyset(5, 4, "test", Set.of(5), Instant.now().getEpochSecond(), true, true, new HashSet<>()));
+        }};
+
+        setAdminKeysets(keysets);
+        mockSiteExistence(5, 7, 4, 8);
+
+        String body = "  {\n" +
+                "    \"hash\": 0\n" +
+                "  }";
+
+        post(vertx, testContext, "api/sharing/list/8", body, response -> {
+            assertEquals(200, response.statusCode());
+
+            AdminKeyset expected = new AdminKeyset(6, 8, "", Set.of(), Instant.now().getEpochSecond(), true, true, Set.of(ClientType.DSP));
+            compareKeysetListToResult(expected, response.bodyAsJsonObject().getJsonArray("allowed_sites"));
+            compareKeysetTypeListToResult(expected, response.bodyAsJsonObject().getJsonArray("allowed_types"));
+            assertEquals(expected.getAllowedSites(), keysets.get(6).getAllowedSites());
+            assertEquals(expected.getAllowedTypes(), keysets.get(6).getAllowedTypes());
+
+            verify(keysetKeyManager).addKeysetKey(6);
+            testContext.completeNow();
+        });
+    }
+
     @Test
     void listSiteSetNewWithType(Vertx vertx, VertxTestContext testContext) {
         fakeAuth(Role.SHARING_PORTAL);
@@ -1196,6 +1227,7 @@ void KeysetSetUpdateNullAllowedSites(Vertx vertx, VertxTestContext testContext)
             compareKeysetListToResult(expected, response.bodyAsJsonObject().getJsonArray("allowed_sites"));
             compareKeysetTypeListToResult(expected, response.bodyAsJsonObject().getJsonArray("allowed_types"));
             assertEquals(expected.getAllowedSites(), keysets.get(1).getAllowedSites());
+            assertEquals(expected.getAllowedTypes(), keysets.get(1).getAllowedTypes());
 
             testContext.completeNow();
         });
@@ -1225,6 +1257,7 @@ void KeysetSetUpdateExplicitlyNullAllowedSites(Vertx vertx, VertxTestContext tes
             compareKeysetListToResult(expected, response.bodyAsJsonObject().getJsonArray("allowed_sites"));
             compareKeysetTypeListToResult(expected, response.bodyAsJsonObject().getJsonArray("allowed_types"));
             assertEquals(expected.getAllowedSites(), keysets.get(1).getAllowedSites());
+            assertEquals(expected.getAllowedTypes(), keysets.get(1).getAllowedTypes());
 
             testContext.completeNow();
         });