commit 6d2cc82b0c557b549a31b4905a8c6cd3440a19f1
author margaretha <margaretha@ids-mannheim.de> Thu Jan 18 20:50:05 2018 +0100
committer margaretha <margaretha@ids-mannheim.de> Thu Jan 18 20:50:05 2018 +0100
tree 8ad0711348c85ca65044b9a1844034bbab3a3599
parent 7c38f4c039fa80c190d484d458ccefdbd9094cbe

Fixed user-group tests due to updates in sql data.

Change-Id: I199ae1c2f6371e54d24da773b0a7e64a74cb45c6

full/src/test/java/de/ids_mannheim/korap/web/controller/UserGroupControllerTest.java

diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/UserGroupControllerTest.java b/full/src/test/java/de/ids_mannheim/korap/web/controller/UserGroupControllerTest.java
index 79c5236..5b7ca8a 100644
--- a/full/src/test/java/de/ids_mannheim/korap/web/controller/UserGroupControllerTest.java
+++ b/full/src/test/java/de/ids_mannheim/korap/web/controller/UserGroupControllerTest.java
@@ -40,10 +40,15 @@
         //        System.out.println(entity);
         JsonNode node = JsonUtils.readTree(entity);
 
-        assertEquals(2, node.at("/0/id").asInt());
-        assertEquals("dory group", node.at("/0/name").asText());
-        assertEquals("dory", node.at("/0/owner").asText());
-        assertEquals(3, node.at("/0/members").size());
+        JsonNode group;
+        for (int i=0; i< node.size(); i++){
+            group = node.get(i);
+            if (group.at("/id").asInt() == 2){
+                assertEquals("dory group", group.at("/name").asText());
+                assertEquals("dory", group.at("/owner").asText());
+                assertEquals(3, group.at("/members").size());
+            }
+        }
     }
 
     // nemo is a group member in dory group
@@ -67,7 +72,7 @@
         assertEquals(0, node.at("/0/members").size());
     }
 
-    // marlin does not have any group
+    // marlin has a group
     @Test
     public void testRetrieveMarlinGroups () throws KustvaktException {
         ClientResponse response = resource().path("group").path("list")
@@ -79,7 +84,7 @@
         String entity = response.getEntity(String.class);
         assertEquals(Status.OK.getStatusCode(), response.getStatus());
         JsonNode node = JsonUtils.readTree(entity);
-        assertEquals(0, node.size());
+        assertEquals(1, node.size());
     }
 
     
@@ -126,12 +131,19 @@
         assertEquals(Status.OK.getStatusCode(), response.getStatus());
         
         JsonNode node = JsonUtils.readTree(entity);
-        assertEquals(1, node.size());
-        assertEquals(2, node.at("/0/id").asInt());
-        assertEquals("dory group", node.at("/0/name").asText());
-        assertEquals("dory", node.at("/0/owner").asText());
-        // group members are not allowed to see other members
-        assertEquals(0, node.at("/0/members").size());
+        assertEquals(2, node.size());
+        
+        JsonNode group;
+        for (int i=0; i< node.size(); i++){
+            group = node.get(i);
+            if (group.at("/id").asInt() == 2){
+                assertEquals("dory group", group.at("/name").asText());
+                assertEquals("dory", group.at("/owner").asText());
+                // group members are not allowed to see other members
+                assertEquals(0, group.at("/members").size());
+            }
+        }
+            
     }
     
     // pearl has GroupMemberStatus.DELETED in dory group