X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fusermgt%2FInMemoryGroupSetTest.java;h=03329d1d958f918b150e220e424ad54d3c6d043a;hb=0d8d8f24656e585ee75558cfd6a4c661f8f14985;hp=100fad370439897447bb84c73755d60b9f05ee03;hpb=6baa1546bf990db7c66e9837bbb23f1070bf81e0;p=utils

diff --git a/security/src/test/java/org/wamblee/usermgt/InMemoryGroupSetTest.java b/security/src/test/java/org/wamblee/usermgt/InMemoryGroupSetTest.java
index 100fad37..03329d1d 100644
--- a/security/src/test/java/org/wamblee/usermgt/InMemoryGroupSetTest.java
+++ b/security/src/test/java/org/wamblee/usermgt/InMemoryGroupSetTest.java
@@ -19,26 +19,15 @@ package org.wamblee.usermgt;
 import java.sql.SQLException;
 import java.util.Set;
 
-import org.wamblee.persistence.hibernate.HibernateMappingFiles;
-import org.wamblee.test.spring.SpringTestCase;
-import org.wamblee.test.spring.SpringConfigFiles;
+import junit.framework.TestCase;
 
 /**
  * Tests the inmemory group set. Intended to be subclassed for other
  * implementations of group set. 
  */
-public class InMemoryGroupSetTest extends SpringTestCase {
+public class InMemoryGroupSetTest extends TestCase {
     
-    protected GroupSet _groups; 
-    
-    public InMemoryGroupSetTest() { 
-        super(SpringConfigFiles.class, HibernateMappingFiles.class);
-    }
-    
-    protected InMemoryGroupSetTest(Class<? extends SpringConfigFiles> aSprings, 
-            Class<? extends HibernateMappingFiles> aMappings) { 
-        super(aSprings, aMappings); 
-    }
+    protected GroupSet groups; 
    
     /**
      * This method must be overriden in subclasses. 
@@ -54,7 +43,7 @@ public class InMemoryGroupSetTest extends SpringTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        _groups = createGroupSet(); 
+        groups = createGroupSet(); 
         checkGroupCount(0); 
     }
     
@@ -81,7 +70,7 @@ public class InMemoryGroupSetTest extends SpringTestCase {
      * @param aSize Expected number of groups. 
      */
     protected void checkGroupCount(int aSize) throws SQLException { 
-        assertEquals(aSize, _groups.size());
+        assertEquals(aSize, groups.size());
     }
     
     /**
@@ -91,13 +80,13 @@ public class InMemoryGroupSetTest extends SpringTestCase {
      */
     public void testAdd() throws SQLException { 
        Group group = new Group("group1"); 
-       assertTrue(  _groups.add(group) );
+       assertTrue(  groups.add(group) );
        checkGroupExists(group.getName());
        checkGroupCount(1);
-       Group group2 = _groups.find("group1"); 
+       Group group2 = groups.find("group1"); 
        assertNotNull(group2);
        assertEquals(group.getName(), group2.getName()); 
-       Set<Group> set = _groups.list(); 
+       Set<Group> set = groups.list(); 
        assertEquals(1, set.size()); 
        assertTrue(set.contains(group));
     }
@@ -110,12 +99,12 @@ public class InMemoryGroupSetTest extends SpringTestCase {
     public void testFindUnknownGroup() throws SQLException { 
        Group group1 = new Group("group1"); 
        Group group2 = new Group("group2");
-       _groups.add(group1); 
-       _groups.add(group2);
+       groups.add(group1); 
+       groups.add(group2);
        checkGroupExists(group1.getName()); 
        checkGroupExists(group2.getName()); 
     
-       assertNull( _groups.find("group3") );
+       assertNull( groups.find("group3") );
        checkGroupNotExists("group3");
     }
     
@@ -124,13 +113,13 @@ public class InMemoryGroupSetTest extends SpringTestCase {
      */
     public void testAddDuplicateGroup() throws SQLException { 
        Group group1 = new Group("group1"); 
-       _groups.add(group1); 
+       groups.add(group1); 
        
-       assertEquals(1, _groups.list().size()); 
-       assertTrue(_groups.contains(group1));
+       assertEquals(1, groups.list().size()); 
+       assertTrue(groups.contains(group1));
        group1 = new Group("group1");
-       assertFalse(_groups.add(group1));
-       assertEquals(1, _groups.list().size());
+       assertFalse(groups.add(group1));
+       assertEquals(1, groups.list().size());
        
        checkGroupExists(group1.getName()); 
        checkGroupCount(1); 
@@ -143,14 +132,14 @@ public class InMemoryGroupSetTest extends SpringTestCase {
      */
     public void testRemoveGroup() throws SQLException { 
         Group group1 = new Group("group1"); 
-        _groups.add(group1); 
-        assertTrue(_groups.contains(group1));
+        groups.add(group1); 
+        assertTrue(groups.contains(group1));
         checkGroupCount(1);
         
-        assertTrue(_groups.remove(group1)); 
-        assertFalse(_groups.contains(group1)); 
-        assertNull(_groups.find(group1.getName()));
-        assertEquals(0, _groups.list().size());
+        assertTrue(groups.remove(group1)); 
+        assertFalse(groups.contains(group1)); 
+        assertNull(groups.find(group1.getName()));
+        assertEquals(0, groups.list().size());
         checkGroupCount(0);
     }
   
@@ -161,14 +150,14 @@ public class InMemoryGroupSetTest extends SpringTestCase {
      */
     public void testRemoveNonExistingGroup() throws SQLException { 
         Group group1 = new Group("group1"); 
-        _groups.add(group1); 
+        groups.add(group1); 
         checkGroupCount(1);
         Group nonExistingGroup = new Group("group2"); 
         nonExistingGroup.setPrimaryKey(new Long(1000));
         nonExistingGroup.setPersistedVersion(1000);
-        assertFalse(_groups.remove(nonExistingGroup));
-        assertTrue(_groups.contains(group1)); 
-        assertEquals(1, _groups.list().size());
+        assertFalse(groups.remove(nonExistingGroup));
+        assertTrue(groups.contains(group1)); 
+        assertEquals(1, groups.list().size());
         checkGroupCount(1); 
     }
     
@@ -181,15 +170,15 @@ public class InMemoryGroupSetTest extends SpringTestCase {
         Group group1 = new Group("group1"); 
         Group group2 = new Group("group2"); 
         Group group3 = new Group("group3"); 
-        assertTrue(_groups.add(group1)); 
-        assertTrue(_groups.add(group2)); 
-        assertTrue(_groups.add(group3));
+        assertTrue(groups.add(group1)); 
+        assertTrue(groups.add(group2)); 
+        assertTrue(groups.add(group3));
         
         checkGroupExists(group1.getName()); 
         checkGroupExists(group2.getName()); 
         checkGroupExists(group3.getName()); 
         
-        Set<Group> set = _groups.list(); 
+        Set<Group> set = groups.list(); 
         assertTrue(set.contains(group1)); 
         assertTrue(set.contains(group2)); 
         assertTrue(set.contains(group3));