X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fusermgt%2Fhibernate%2FHibernateGroupSetTest.java;h=43bf8c899052fcba7c936dd6cffeb7d95c4fab57;hb=0d8d8f24656e585ee75558cfd6a4c661f8f14985;hp=be27a6299a6c9e9849645d79d05e9992257411f1;hpb=da9f9b076d235d96adb7513d3004697bfc91293b;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 be27a629..43bf8c89 100644
--- a/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateGroupSetTest.java
+++ b/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateGroupSetTest.java
@@ -24,7 +24,7 @@ import java.util.Map;
 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.test.spring.TestTransactionCallback;
 import org.wamblee.usermgt.GroupSet;
 import org.wamblee.usermgt.InMemoryGroupSetTest;
@@ -40,35 +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);
+       super.tearDown();
+    }
     
     public void setDatabaseTester(DatabaseTesterComponent aDatabaseTester) {
-        _databaseTester = aDatabaseTester;
+        databaseTester = aDatabaseTester;
     }
    
     public void setGroupSet(GroupSet aGroupSet) {
-        _groupSet = aGroupSet;
+        groupSet = aGroupSet;
     }
 
     /* (non-Javadoc)
@@ -76,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)
@@ -86,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; 
             }
         }); 
@@ -110,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)
@@ -120,7 +126,7 @@ public class HibernateGroupSetTest extends InMemoryGroupSetTest {
      */
     @Override
     protected GroupSet createGroupSet() {
-        return _groupSet; 
+        return groupSet; 
     }
     
 }