SEC-272: Partial group manager implementation.

core/src/test/java/org/springframework/security/PopulatedDatabase.java

@@ -99,6 +99,11 @@ public class PopulatedDatabase {
         template.execute("INSERT INTO acl_permission VALUES (null, 3, 'scott', 14);");
         template.execute("INSERT INTO acl_permission VALUES (null, 6, 'scott', 1);");
 
+        createGroupTables(template);
+        insertGroupData(template);
+    }
+
+    public static void createGroupTables(JdbcTemplate template) {
         //  Group tables and data
         template.execute(
                 "CREATE TABLE GROUPS(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 0) PRIMARY KEY, GROUP_NAME VARCHAR_IGNORECASE(50) NOT NULL)");
@@ -106,15 +111,17 @@ public class PopulatedDatabase {
                 "CREATE TABLE GROUP_AUTHORITIES(GROUP_ID BIGINT NOT NULL, AUTHORITY VARCHAR(50) NOT NULL, CONSTRAINT FK_GROUP_AUTHORITIES_GROUP FOREIGN KEY(GROUP_ID) REFERENCES GROUPS(ID))");
         template.execute(
                 "CREATE TABLE GROUP_MEMBERS(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 0) PRIMARY KEY, USERNAME VARCHAR(50) NOT NULL, GROUP_ID BIGINT NOT NULL, CONSTRAINT FK_GROUP_MEMBERS_GROUP FOREIGN KEY(GROUP_ID) REFERENCES GROUPS(ID))");
+    }
 
+    public static void insertGroupData(JdbcTemplate template) {
         template.execute("INSERT INTO USERS VALUES('jerry','password',TRUE)");
         template.execute("INSERT INTO USERS VALUES('tom','password',TRUE)");
 
-        template.execute("INSERT INTO GROUPS VALUES (0, 'GROUP_ZERO')");
-        template.execute("INSERT INTO GROUPS VALUES (1, 'GROUP_ONE')");
-        template.execute("INSERT INTO GROUPS VALUES (2, 'GROUP_TWO')");
+        template.execute("INSERT INTO GROUPS VALUES (0, 'GROUP_0')");
+        template.execute("INSERT INTO GROUPS VALUES (1, 'GROUP_1')");
+        template.execute("INSERT INTO GROUPS VALUES (2, 'GROUP_2')");
         // Group 3 isn't used
-        template.execute("INSERT INTO GROUPS VALUES (3, 'GROUP_THREE')");
+        template.execute("INSERT INTO GROUPS VALUES (3, 'GROUP_3')");
 
         template.execute("INSERT INTO GROUP_AUTHORITIES VALUES (0, 'ROLE_A')");
         template.execute("INSERT INTO GROUP_AUTHORITIES VALUES (1, 'ROLE_B')");

core/src/test/java/org/springframework/security/userdetails/jdbc/JdbcUserDetailsManagerTests.java

@@ -4,6 +4,9 @@ import org.springframework.security.AccessDeniedException;
 import org.springframework.security.Authentication;
 import org.springframework.security.BadCredentialsException;
 import org.springframework.security.MockAuthenticationManager;
+import org.springframework.security.PopulatedDatabase;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
 import org.springframework.security.context.SecurityContextHolder;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 import org.springframework.security.providers.dao.UserCache;
@@ -22,6 +25,8 @@ import org.junit.Test;
 
 import java.util.Map;
 import java.util.HashMap;
+import java.util.List;
+import java.util.Collections;
 
 /**
  * Tests for {@link JdbcUserDetailsManager}
@@ -43,7 +48,7 @@ public class JdbcUserDetailsManagerTests {
 
     @BeforeClass
     public static void createDataSource() {
-        dataSource = new DriverManagerDataSource("org.hsqldb.jdbcDriver", "jdbc:hsqldb:mem:tokenrepotest", "sa", "");
+        dataSource = new DriverManagerDataSource("org.hsqldb.jdbcDriver", "jdbc:hsqldb:mem:jdbcusermgrtest", "sa", "");
     }
 
     @AfterClass
@@ -71,12 +76,17 @@ public class JdbcUserDetailsManagerTests {
                 "password varchar(20) not null, enabled boolean not null)");
         template.execute("create table authorities (username varchar(20) not null, authority varchar(20) not null, " +
                 "constraint fk_authorities_users foreign key(username) references users(username))");
+        PopulatedDatabase.createGroupTables(template);
+        PopulatedDatabase.insertGroupData(template);
     }
 
     @After
     public void dropTablesAndClearContext() {
         template.execute("drop table authorities");
         template.execute("drop table users");
+        template.execute("drop table group_authorities");
+        template.execute("drop table group_members");
+        template.execute("drop table groups");
         SecurityContextHolder.clearContext();
     }
 
@@ -177,6 +187,39 @@ public class JdbcUserDetailsManagerTests {
         assertTrue(cache.getUserMap().containsKey("joe"));
     }
 
+    @Test
+    public void findAllGroupsReturnsExpectedGroupNames() {
+        List<String> groups = manager.findAllGroups();
+        assertEquals(4, groups.size());
+
+        Collections.sort(groups);
+        assertEquals("GROUP_0", groups.get(0));
+        assertEquals("GROUP_1", groups.get(1));
+        assertEquals("GROUP_2", groups.get(2));
+        assertEquals("GROUP_3", groups.get(3));
+    }
+
+    @Test
+    public void findGroupMembersReturnsCorrectData() {
+        List<String> groupMembers = manager.findUsersInGroup("GROUP_0");
+        assertEquals(1, groupMembers.size());
+        assertEquals("jerry", groupMembers.get(0));
+        groupMembers = manager.findUsersInGroup("GROUP_1");
+        assertEquals(2, groupMembers.size());
+    }
+
+    @Test
+    public void createGroupInsertsCorrectData() {
+        manager.createGroup("TEST_GROUP", AuthorityUtils.stringArrayToAuthorityArray(new String[] {"ROLE_X", "ROLE_Y"}));
+
+        List roles = template.queryForList(
+                "select ga.authority from groups g, group_authorities ga " +
+                "where ga.group_id = g.id" +
+                " and g.group_name = 'TEST_GROUP'");
+
+        assertEquals(2, roles.size());
+    }
+
     private Authentication authenticateJoe() {
         UsernamePasswordAuthenticationToken auth =
                 new UsernamePasswordAuthenticationToken("joe","password", joe.getAuthorities());