X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fusermgt%2Fhibernate%2FHibernateGroupSetTest.java;h=43bf8c899052fcba7c936dd6cffeb7d95c4fab57;hb=81fe8784a2182e25f92a7591ec5b0fba00afb828;hp=f1f5d18b0c7856f882124cfbb4d4918aa6e9f949;hpb=5475d1a90baf83eb7049588ba415d7cfe36387ad;p=utils

diff --git a/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateGroupSetTest.java b/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateGroupSetTest.java
index f1f5d18b..43bf8c89 100644
--- a/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateGroupSetTest.java
+++ b/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateGroupSetTest.java
@@ -40,41 +40,41 @@ public class HibernateGroupSetTest extends InMemoryGroupSetTest {
     
     private static final String GROUP_QUERY = "select * from " + GROUP_TABLE + " where name = ?";
     
-    private DefaultContainer _container;
-    private Scope _scope;
+    private DefaultContainer container;
+    private Scope scope;
     
-    private DatabaseTesterComponent _databaseTester;
-    private GroupSet _groupSet; 
+    private DatabaseTesterComponent databaseTester;
+    private GroupSet groupSet; 
     
     @Override
     protected void setUp() throws Exception {
         
-        _container = new UserMgtRepositoryTestContainer("top");
+        container = new UserMgtRepositoryTestContainer("top");
         
         ObjectConfiguration config = new ObjectConfiguration(
                 HibernateGroupSetTest.class);
         config.getSetterConfig().clear().add(
-                "groupSet").add("databaseTester");
-        _container.addComponent("testcase", this, config);
+                "setGroupSet").add("setDatabaseTester");
+        container.addComponent("testcase", this, config);
 
-        _scope = _container.start();
+        scope = container.start();
 
-        _databaseTester.cleanDatabase();
+        databaseTester.cleanDatabase();
         super.setUp();
     }
 
     @Override
     protected void tearDown() throws Exception { 
-        _container.stop(_scope);
+        container.stop(scope);
        super.tearDown();
     }
     
     public void setDatabaseTester(DatabaseTesterComponent aDatabaseTester) {
-        _databaseTester = aDatabaseTester;
+        databaseTester = aDatabaseTester;
     }
    
     public void setGroupSet(GroupSet aGroupSet) {
-        _groupSet = aGroupSet;
+        groupSet = aGroupSet;
     }
 
     /* (non-Javadoc)
@@ -82,9 +82,9 @@ public class HibernateGroupSetTest extends InMemoryGroupSetTest {
      */
     @Override
     protected void checkGroupCount(int aSize) throws SQLException {
-        _databaseTester.flush(); 
+        databaseTester.flush(); 
         super.checkGroupCount(aSize);
-        assertEquals(aSize, _databaseTester.getTableSize(GROUP_TABLE));
+        assertEquals(aSize, databaseTester.getTableSize(GROUP_TABLE));
     }
     
     /* (non-Javadoc)
@@ -92,17 +92,17 @@ public class HibernateGroupSetTest extends InMemoryGroupSetTest {
      */
     @Override
     protected void checkGroupExists(final String aGroup) throws SQLException {
-        _databaseTester.flush();
+        databaseTester.flush();
         Map<String,Integer> result = 
-        _databaseTester.executeTransaction(new TestTransactionCallback()  { 
+        databaseTester.executeTransaction(new TestTransactionCallback()  { 
             /* (non-Javadoc)
              * @see org.wamblee.test.TestTransactionCallback#execute()
              */
             @Override
             public Map execute() throws Exception {
-                ResultSet result = _databaseTester.executeQuery(GROUP_QUERY, aGroup);
+                ResultSet result = databaseTester.executeQuery(GROUP_QUERY, aGroup);
                 Map<String,Integer> res = new HashMap<String,Integer>(); 
-                res.put("result", _databaseTester.countResultSet(result));
+                res.put("result", databaseTester.countResultSet(result));
                 return res; 
             }
         }); 
@@ -116,9 +116,9 @@ public class HibernateGroupSetTest extends InMemoryGroupSetTest {
      */
     @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));
     }
     
     /* (non-Javadoc)
@@ -126,7 +126,7 @@ public class HibernateGroupSetTest extends InMemoryGroupSetTest {
      */
     @Override
     protected GroupSet createGroupSet() {
-        return _groupSet; 
+        return groupSet; 
     }
     
 }