X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fusermgt%2Fhibernate%2FHibernateUserSetTest.java;h=46e80fb3d005afc3c555c6f5d381b663c275e119;hb=0d8d8f24656e585ee75558cfd6a4c661f8f14985;hp=30a7acc4b7e8191ec0358b320304bb036ded4b8e;hpb=23c06231718738c1ea9c6863f753fe4e8ffa3267;p=utils

diff --git a/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java b/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java
index 30a7acc4..46e80fb3 100644
--- a/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java
+++ b/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java
@@ -21,23 +21,17 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Set;
 
-import javax.sql.DataSource;
-
-import org.wamblee.cache.Cache;
 import org.wamblee.cache.EhCache;
-import org.wamblee.general.BeanKernel;
 import org.wamblee.system.adapters.DefaultContainer;
 import org.wamblee.system.adapters.ObjectConfiguration;
 import org.wamblee.system.core.Scope;
-import org.wamblee.system.spring.DatabaseTesterComponent;
+import org.wamblee.system.spring.component.DatabaseTesterComponent;
 import org.wamblee.usermgt.Group;
 import org.wamblee.usermgt.GroupSet;
 import org.wamblee.usermgt.InMemoryUserSetTest;
 import org.wamblee.usermgt.User;
 import org.wamblee.usermgt.UserMgtException;
 import org.wamblee.usermgt.UserSet;
-import org.wamblee.usermgt.UsermgtHibernateMappingFiles;
-import org.wamblee.usermgt.UsermgtSpringConfigFiles;
 
 /**
  * Tests for {@link org.wamblee.usermgt.hibernate.HibernateGroupSet}
@@ -54,19 +48,13 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
     private static final String GROUP_QUERY = "select * from " + GROUP_TABLE
             + " where name = ?";
 
-    public HibernateUserSetTest() {
-        super(UsermgtSpringConfigFiles.class,
-                UsermgtHibernateMappingFiles.class);
-    }
-
-    private DefaultContainer _container;
-    private Scope _scope;
-
-    private DataSource _datasource;
-    private UserSet _userset;
-    private GroupSet _groupset;
-    private EhCache<Serializable, Serializable> _userCache;
-    private DatabaseTesterComponent _databaseTester;
+    private DefaultContainer container;
+    private Scope scope;
+    
+    private UserSet userset;
+    private GroupSet groupset;
+    private EhCache<Serializable, Serializable> userCache;
+    private DatabaseTesterComponent databaseTester;
 
     /*
      * (non-Javadoc)
@@ -76,45 +64,41 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
     @Override
     protected void setUp() throws Exception {
 
-        _container = new UserMgtRepositoryTestContainer("top");
+        container = new UserMgtRepositoryTestContainer("top");
        
         ObjectConfiguration config = new ObjectConfiguration(
                 HibernateUserSetTest.class);
-        config.getSetterConfig().clear().add("datasource").add("userset").add(
-                "groupset").add("databaseTester").add("userCache");
-        _container.addComponent("testcase", this, config);
+        config.getSetterConfig().clear().add("setUserset").add(
+                "setGroupset").add("setDatabaseTester").add("setUserCache");
+        container.addComponent("testcase", this, config);
 
-        _scope = _container.start();
+        scope = container.start();
 
         clearUserCache();
-        _databaseTester.cleanDatabase();
+        databaseTester.cleanDatabase();
         
         super.setUp();
     }
 
-    public void setDatasource(DataSource aDatasource) {
-        _datasource = aDatasource;
-    }
-
     public void setUserset(UserSet aUserset) {
-        _userset = aUserset;
+        userset = aUserset;
     }
 
     public void setGroupset(GroupSet aGroupset) {
-        _groupset = aGroupset;
+        groupset = aGroupset;
     }
 
     public void setUserCache(EhCache<Serializable, Serializable> aUserCache) {
-        _userCache = aUserCache;
+        userCache = aUserCache;
     }
 
     public void setDatabaseTester(DatabaseTesterComponent aDatabaseTester) {
-        _databaseTester = aDatabaseTester;
+        databaseTester = aDatabaseTester;
     }
 
     @Override
     protected void tearDown() throws Exception {
-        _container.stop(_scope);
+        container.stop(scope);
         super.tearDown();
     }
 
@@ -122,7 +106,7 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
      * Clears the user cache.
      */
     private void clearUserCache() {
-        _userCache.clear();
+        userCache.clear();
     }
 
     /*
@@ -132,9 +116,9 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
      */
     @Override
     protected void checkUserCount(int aSize) throws SQLException {
-        _databaseTester.flush();
+        databaseTester.flush();
         super.checkUserCount(aSize);
-        assertEquals(aSize, _databaseTester.getTableSize(USER_TABLE));
+        assertEquals(aSize, databaseTester.getTableSize(USER_TABLE));
     }
 
     /*
@@ -144,9 +128,9 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
      */
     @Override
     protected void checkUserExists(String aUser) throws SQLException {
-        _databaseTester.flush();
-        ResultSet result = _databaseTester.executeQuery(USER_QUERY, aUser);
-        assertEquals(1, _databaseTester.countResultSet(result));
+        databaseTester.flush();
+        ResultSet result = databaseTester.executeQuery(USER_QUERY, aUser);
+        assertEquals(1, databaseTester.countResultSet(result));
     }
 
     /*
@@ -156,9 +140,9 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
      */
     @Override
     protected void checkUserNotExists(String aUser) throws SQLException {
-        _databaseTester.flush();
-        ResultSet result = _databaseTester.executeQuery(USER_QUERY, aUser);
-        assertEquals(0, _databaseTester.countResultSet(result));
+        databaseTester.flush();
+        ResultSet result = databaseTester.executeQuery(USER_QUERY, aUser);
+        assertEquals(0, databaseTester.countResultSet(result));
     }
 
     /*
@@ -168,8 +152,8 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
      */
     @Override
     protected void checkGroupCount(int aSize) throws SQLException {
-        _databaseTester.flush();
-        assertEquals(aSize, _databaseTester.getTableSize(GROUP_TABLE));
+        databaseTester.flush();
+        assertEquals(aSize, databaseTester.getTableSize(GROUP_TABLE));
     }
 
     /*
@@ -179,10 +163,10 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
      */
     @Override
     protected void checkGroupExists(String aGroup) throws SQLException {
-        _databaseTester.flush();
+        databaseTester.flush();
 
-        ResultSet result = _databaseTester.executeQuery(GROUP_QUERY, aGroup);
-        assertEquals(1, _databaseTester.countResultSet(result));
+        ResultSet result = databaseTester.executeQuery(GROUP_QUERY, aGroup);
+        assertEquals(1, databaseTester.countResultSet(result));
     }
 
     /*
@@ -192,9 +176,9 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
      */
     @Override
     protected void checkGroupNotExists(String aGroup) throws SQLException {
-        _databaseTester.flush();
-        ResultSet result = _databaseTester.executeQuery(GROUP_QUERY, aGroup);
-        assertEquals(0, _databaseTester.countResultSet(result));
+        databaseTester.flush();
+        ResultSet result = databaseTester.executeQuery(GROUP_QUERY, aGroup);
+        assertEquals(0, databaseTester.countResultSet(result));
     }
 
     /*
@@ -204,7 +188,7 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
      */
     @Override
     protected UserSet createUserSet() {
-        return _userset;
+        return userset;
     }
 
     /*
@@ -214,7 +198,7 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
      */
     @Override
     protected GroupSet createGroupSet() {
-        return _groupset;
+        return groupset;
     }
 
     /**
@@ -223,7 +207,7 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
      * group2.
      */
     public void testVerifyAddRemove() throws SQLException, UserMgtException {
-        _databaseTester.cleanDatabase(); // just to be sure.
+        databaseTester.cleanDatabase(); // just to be sure.
         GroupSet groups = getGroups();
         assertEquals(0, groups.size());
         Group group1 = createGroup("group1");