X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FTestUserGroupMembership.java;h=c1834acdeae36a8e4ba30950e8c74c26dea79ad4;hb=9136e3e03b6881b32aada896be3241e46cbd33d9;hp=fa670721d2315862eb20608047e68f23eb120a17;hpb=6de1708def257130eca7f9e29ee41be8a28562ef;p=gigi.git

diff --git a/tests/org/cacert/gigi/TestUserGroupMembership.java b/tests/org/cacert/gigi/TestUserGroupMembership.java
index fa670721..c1834acd 100644
--- a/tests/org/cacert/gigi/TestUserGroupMembership.java
+++ b/tests/org/cacert/gigi/TestUserGroupMembership.java
@@ -3,14 +3,14 @@ package org.cacert.gigi;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 
 import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.database.GigiPreparedStatement;
+import org.cacert.gigi.database.GigiResultSet;
 import org.cacert.gigi.dbObjects.Group;
 import org.cacert.gigi.dbObjects.ObjectCache;
 import org.cacert.gigi.dbObjects.User;
@@ -19,7 +19,7 @@ import org.junit.Test;
 
 public class TestUserGroupMembership extends ManagedTest {
 
-    private final Group ttpGroup = Group.getByString("ttp-assuer");
+    private final Group ttpGroup = Group.getByString("ttp-assurer");
 
     private final Group supporter = Group.getByString("supporter");
 
@@ -39,7 +39,7 @@ public class TestUserGroupMembership extends ManagedTest {
         assertThat(u2, is(not(sameInstance(u))));
         assertBehavesTtpGroup(u2);
 
-        ResultSet rs = fetchGroupRowsFor(u);
+        GigiResultSet rs = fetchGroupRowsFor(u);
 
         assertTrue(rs.next());
         assertEquals(0, rs.getInt("revokedby"));
@@ -69,7 +69,7 @@ public class TestUserGroupMembership extends ManagedTest {
         assertThat(u2, is(not(sameInstance(u))));
         assertBehavesEmpty(u);
 
-        ResultSet rs = fetchGroupRowsFor(u);
+        GigiResultSet rs = fetchGroupRowsFor(u);
         assertTrue(rs.next());
         assertEquals(granter.getId(), rs.getInt("revokedby"));
         assertEquals(granter.getId(), rs.getInt("grantedby"));
@@ -81,10 +81,10 @@ public class TestUserGroupMembership extends ManagedTest {
         assertFalse(rs.next());
     }
 
-    private ResultSet fetchGroupRowsFor(User u) throws SQLException {
-        PreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT * FROM user_groups WHERE user=?");
+    private GigiResultSet fetchGroupRowsFor(User u) throws SQLException {
+        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT * FROM user_groups WHERE user=?");
         ps.setInt(1, u.getId());
-        ResultSet rs = ps.executeQuery();
+        GigiResultSet rs = ps.executeQuery();
         return rs;
     }
 
@@ -99,4 +99,29 @@ public class TestUserGroupMembership extends ManagedTest {
         assertTrue(u.isInGroup(ttpGroup));
         assertFalse(u.isInGroup(supporter));
     }
+
+    @Test
+    public void testListGroup() {
+        Group g = Group.getByString("supporter");
+        User ux = User.getById(createVerifiedUser("fn", "ln", createUniqueName() + "@example.org", TEST_PASSWORD));
+        User ux2 = User.getById(createVerifiedUser("fn", "ln", createUniqueName() + "@example.org", TEST_PASSWORD));
+        assertEquals(0, g.getMembers(0, 10).length);
+        ux.grantGroup(ux, g);
+        assertEquals(1, g.getMembers(0, 10).length);
+        ux2.grantGroup(ux, g);
+        assertEquals(2, g.getMembers(0, 10).length);
+        ux2.revokeGroup(ux, g);
+        assertEquals(1, g.getMembers(0, 10).length);
+        ux.revokeGroup(ux, g);
+        assertEquals(0, g.getMembers(0, 10).length);
+
+    }
+
+    @Test
+    public void testGroupEquals() {
+        assertTrue(ttpGroup.equals(ttpGroup));
+        assertFalse(ttpGroup.equals(null));
+        assertFalse(ttpGroup.equals(""));
+        assertFalse(ttpGroup.equals(supporter));
+    }
 }