X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fusermgt%2FInMemoryUserSetTest.java;h=76eadebb892aca74280273fe2581ffc69d6dddf8;hb=0d8d8f24656e585ee75558cfd6a4c661f8f14985;hp=0e3c7592136334e553110d6317cd000cd7b83c0b;hpb=162af365e45e54e5e8d656be276914df2005eaec;p=utils diff --git a/security/src/test/java/org/wamblee/usermgt/InMemoryUserSetTest.java b/security/src/test/java/org/wamblee/usermgt/InMemoryUserSetTest.java index 0e3c7592..76eadebb 100644 --- a/security/src/test/java/org/wamblee/usermgt/InMemoryUserSetTest.java +++ b/security/src/test/java/org/wamblee/usermgt/InMemoryUserSetTest.java @@ -19,34 +19,24 @@ package org.wamblee.usermgt; import java.sql.SQLException; import java.util.Set; -import org.wamblee.persistence.hibernate.HibernateMappingFiles; +import junit.framework.TestCase; + import org.wamblee.security.encryption.Md5HexMessageDigester; -import org.wamblee.test.SpringConfigFiles; -import org.wamblee.test.SpringTestCase; import org.wamblee.usermgt.UserMgtException.Reason; /** * Tests the inmemory user set. Intended to be subclassed for other * implementations of user set. */ -public class InMemoryUserSetTest extends SpringTestCase { +public class InMemoryUserSetTest extends TestCase { protected static final String PASSWORD = "abc123"; - private UserSet _users; - private GroupSet _groups; - - private Group _group; + private UserSet users; + private GroupSet groups; - public InMemoryUserSetTest() { - super(SpringConfigFiles.class, HibernateMappingFiles.class); - } + private Group group; - protected InMemoryUserSetTest(Class aSprings, - Class aMappings) { - super(aSprings, aMappings); - } - /** * This method must be overriden in subclasses. * @return New user set object. @@ -70,20 +60,20 @@ public class InMemoryUserSetTest extends SpringTestCase { @Override protected void setUp() throws Exception { super.setUp(); - _users = createUserSet(); - _groups = createGroupSet(); - _group = new Group("group0"); - _groups.add(_group); + users = createUserSet(); + groups = createGroupSet(); + group = new Group("group0"); + groups.add(group); checkUserCount(0); } protected UserSet getUsers() { - return _users; + return users; } protected GroupSet getGroups() { - return _groups; + return groups; } protected Group createGroup(String aName) { @@ -123,7 +113,7 @@ public class InMemoryUserSetTest extends SpringTestCase { * @param aSize Expected number of users. */ protected void checkUserCount(int aSize) throws SQLException { - assertEquals(aSize, _users.size()); + assertEquals(aSize, users.size()); } /** @@ -157,14 +147,14 @@ public class InMemoryUserSetTest extends SpringTestCase { * */ public void testAdd() throws SQLException, UserMgtException { - User user = createUser("user1", PASSWORD, _group); - assertTrue( _users.add(user) ); + User user = createUser("user1", PASSWORD, group); + assertTrue( users.add(user) ); checkUserExists(user.getName()); checkUserCount(1); - User user2 = _users.find("user1"); + User user2 = users.find("user1"); assertNotNull(user2); assertEquals(user.getName(), user2.getName()); - Set set = _users.list(); + Set set = users.list(); assertEquals(1, set.size()); assertTrue(set.contains(user)); } @@ -175,14 +165,14 @@ public class InMemoryUserSetTest extends SpringTestCase { * */ public void testFindUnknownUser() throws SQLException, UserMgtException { - User user1 = createUser("user1", PASSWORD, _group); - User user2 = createUser("user2", PASSWORD, _group); - _users.add(user1); - _users.add(user2); + User user1 = createUser("user1", PASSWORD, group); + User user2 = createUser("user2", PASSWORD, group); + users.add(user1); + users.add(user2); checkUserExists(user1.getName()); checkUserExists(user2.getName()); - assertNull( _users.find("user3") ); + assertNull( users.find("user3") ); checkUserNotExists("user3"); } @@ -190,14 +180,14 @@ public class InMemoryUserSetTest extends SpringTestCase { * Adds duplicate user. Verifies that the existing user is left untouched. */ public void testAddDuplicateUser() throws SQLException, UserMgtException { - User user1 = createUser("user1", PASSWORD, _group); - _users.add(user1); + User user1 = createUser("user1", PASSWORD, group); + users.add(user1); - assertEquals(1, _users.list().size()); - assertTrue(_users.contains(user1)); - user1 = createUser("user1", PASSWORD, _group); - assertFalse(_users.add(user1)); - assertEquals(1, _users.list().size()); + assertEquals(1, users.list().size()); + assertTrue(users.contains(user1)); + user1 = createUser("user1", PASSWORD, group); + assertFalse(users.add(user1)); + assertEquals(1, users.list().size()); checkUserExists(user1.getName()); checkUserCount(1); @@ -209,15 +199,15 @@ public class InMemoryUserSetTest extends SpringTestCase { * */ public void testRemoveUser() throws SQLException, UserMgtException { - User user1 = createUser("user1", PASSWORD, _group); - _users.add(user1); - assertTrue(_users.contains(user1)); + User user1 = createUser("user1", PASSWORD, group); + users.add(user1); + assertTrue(users.contains(user1)); checkUserCount(1); - assertTrue(_users.remove(user1)); - assertFalse(_users.contains(user1)); - assertNull(_users.find(user1.getName())); - assertEquals(0, _users.list().size()); + assertTrue(users.remove(user1)); + assertFalse(users.contains(user1)); + assertNull(users.find(user1.getName())); + assertEquals(0, users.list().size()); checkUserCount(0); } @@ -227,15 +217,15 @@ public class InMemoryUserSetTest extends SpringTestCase { * */ public void testRemoveNonExistingUser() throws SQLException, UserMgtException { - User user1 = createUser("user1", PASSWORD, _group); - _users.add(user1); + User user1 = createUser("user1", PASSWORD, group); + users.add(user1); checkUserCount(1); - User nonExistingUser = createUser("user2", PASSWORD, _group); + User nonExistingUser = createUser("user2", PASSWORD, group); nonExistingUser.setPrimaryKey(new Long(1000)); nonExistingUser.setPersistedVersion(10); - assertFalse(_users.remove(nonExistingUser)); - assertTrue(_users.contains(user1)); - assertEquals(1, _users.list().size()); + assertFalse(users.remove(nonExistingUser)); + assertTrue(users.contains(user1)); + assertEquals(1, users.list().size()); checkUserCount(1); } @@ -245,18 +235,18 @@ public class InMemoryUserSetTest extends SpringTestCase { * */ public void testList() throws SQLException, UserMgtException { - User user1 = createUser("user1", PASSWORD, _group); - User user2 = createUser("user2", PASSWORD, _group); - User user3 = createUser("user3", PASSWORD, _group); - assertTrue(_users.add(user1)); - assertTrue(_users.add(user2)); - assertTrue(_users.add(user3)); + User user1 = createUser("user1", PASSWORD, group); + User user2 = createUser("user2", PASSWORD, group); + User user3 = createUser("user3", PASSWORD, group); + assertTrue(users.add(user1)); + assertTrue(users.add(user2)); + assertTrue(users.add(user3)); checkUserExists(user1.getName()); checkUserExists(user2.getName()); checkUserExists(user3.getName()); - Set set = _users.list(); + Set set = users.list(); assertTrue(set.contains(user1)); assertTrue(set.contains(user2)); assertTrue(set.contains(user3)); @@ -274,9 +264,9 @@ public class InMemoryUserSetTest extends SpringTestCase { Group group1 = new Group("group1"); Group group2 = new Group("group2"); Group group3 = new Group("group3"); - _groups.add(group1); - _groups.add(group2); - _groups.add(group3); + groups.add(group1); + groups.add(group2); + groups.add(group3); // user1 user2 user3 // group1 y @@ -289,9 +279,9 @@ public class InMemoryUserSetTest extends SpringTestCase { User user2 = createUser("user2", PASSWORD, group2); user2.addGroup(group3); User user3 = createUser("user3", PASSWORD, group3); - _users.add(user1); - _users.add(user2); - _users.add(user3); + users.add(user1); + users.add(user2); + users.add(user3); checkUserExists(user1.getName()); checkUserExists(user2.getName()); @@ -304,16 +294,16 @@ public class InMemoryUserSetTest extends SpringTestCase { checkUserCount(3); checkGroupCount(3+1); // also count the group that was created in the setUp(). - Set list = _users.list(group1); + Set list = users.list(group1); assertTrue(list.contains(user1)); assertEquals(1, list.size()); - list = _users.list(group2); + list = users.list(group2); assertTrue(list.contains(user1)); assertTrue(list.contains(user2)); assertEquals(2, list.size()); - list = _users.list(group3); + list = users.list(group3); assertTrue(list.contains(user1)); assertTrue(list.contains(user2)); assertTrue(list.contains(user3));