X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fusermgt%2Fhibernate%2FHibernateGroupSetTest.java;h=fa80b1a416b4664eb3f1fd48d3ee61c48368d9ee;hb=2d7b0cb1921d9b37821f7d838ab070f5394a6fa4;hp=bc1e67d173184484245fb57485387063a2c31345;hpb=162af365e45e54e5e8d656be276914df2005eaec;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 bc1e67d1..fa80b1a4 100644
--- a/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateGroupSetTest.java
+++ b/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateGroupSetTest.java
@@ -21,15 +21,18 @@ import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.wamblee.general.BeanKernel;
-import org.wamblee.test.TestTransactionCallback;
+import org.wamblee.system.adapters.DefaultContainer;
+import org.wamblee.system.adapters.ObjectConfiguration;
+import org.wamblee.system.core.Scope;
+import org.wamblee.system.spring.component.DatabaseTesterComponent;
+import org.wamblee.test.spring.TestTransactionCallback;
 import org.wamblee.usermgt.GroupSet;
 import org.wamblee.usermgt.InMemoryGroupSetTest;
-import org.wamblee.usermgt.UsermgtHibernateMappingFiles;
-import org.wamblee.usermgt.UsermgtSpringConfigFiles;
 
 /**
  * Tests for {@link org.wamblee.usermgt.hibernate.HibernateGroupSet} 
+ *
+ * @author Erik Brakkee
  */
 public class HibernateGroupSetTest extends InMemoryGroupSetTest {
     
@@ -37,8 +40,41 @@ public class HibernateGroupSetTest extends InMemoryGroupSetTest {
     
     private static final String GROUP_QUERY = "select * from " + GROUP_TABLE + " where name = ?";
     
-    public HibernateGroupSetTest() { 
-        super(UsermgtSpringConfigFiles.class, UsermgtHibernateMappingFiles.class);
+    private DefaultContainer _container;
+    private Scope _scope;
+    
+    private DatabaseTesterComponent _databaseTester;
+    private GroupSet _groupSet; 
+    
+    @Override
+    protected void setUp() throws Exception {
+        
+        _container = new UserMgtRepositoryTestContainer("top");
+        
+        ObjectConfiguration config = new ObjectConfiguration(
+                HibernateGroupSetTest.class);
+        config.getSetterConfig().clear().add(
+                "setGroupSet").add("setDatabaseTester");
+        _container.addComponent("testcase", this, config);
+
+        _scope = _container.start();
+
+        _databaseTester.cleanDatabase();
+        super.setUp();
+    }
+
+    @Override
+    protected void tearDown() throws Exception { 
+        _container.stop(_scope);
+       super.tearDown();
+    }
+    
+    public void setDatabaseTester(DatabaseTesterComponent aDatabaseTester) {
+        _databaseTester = aDatabaseTester;
+    }
+   
+    public void setGroupSet(GroupSet aGroupSet) {
+        _groupSet = aGroupSet;
     }
 
     /* (non-Javadoc)
@@ -46,9 +82,9 @@ public class HibernateGroupSetTest extends InMemoryGroupSetTest {
      */
     @Override
     protected void checkGroupCount(int aSize) throws SQLException {
-        super.flush(); 
+        _databaseTester.flush(); 
         super.checkGroupCount(aSize);
-        assertEquals(aSize, getTableSize(GROUP_TABLE));
+        assertEquals(aSize, _databaseTester.getTableSize(GROUP_TABLE));
     }
     
     /* (non-Javadoc)
@@ -56,17 +92,17 @@ public class HibernateGroupSetTest extends InMemoryGroupSetTest {
      */
     @Override
     protected void checkGroupExists(final String aGroup) throws SQLException {
-        flush();
+        _databaseTester.flush();
         Map<String,Integer> result = 
-        executeTransaction(new TestTransactionCallback()  { 
+        _databaseTester.executeTransaction(new TestTransactionCallback()  { 
             /* (non-Javadoc)
              * @see org.wamblee.test.TestTransactionCallback#execute()
              */
             @Override
             public Map execute() throws Exception {
-                ResultSet result = executeQuery(GROUP_QUERY, aGroup);
+                ResultSet result = _databaseTester.executeQuery(GROUP_QUERY, aGroup);
                 Map<String,Integer> res = new HashMap<String,Integer>(); 
-                res.put("result", countResultSet(result));
+                res.put("result", _databaseTester.countResultSet(result));
                 return res; 
             }
         }); 
@@ -80,9 +116,9 @@ public class HibernateGroupSetTest extends InMemoryGroupSetTest {
      */
     @Override
     protected void checkGroupNotExists(String aGroup) throws SQLException {
-       flush(); 
-       ResultSet result = executeQuery(GROUP_QUERY, aGroup); 
-       assertEquals(0, countResultSet(result));
+       _databaseTester.flush(); 
+       ResultSet result = _databaseTester.executeQuery(GROUP_QUERY, aGroup); 
+       assertEquals(0, _databaseTester.countResultSet(result));
     }
     
     /* (non-Javadoc)
@@ -90,7 +126,7 @@ public class HibernateGroupSetTest extends InMemoryGroupSetTest {
      */
     @Override
     protected GroupSet createGroupSet() {
-        return BeanKernel.getBeanFactory().find(GroupSet.class); 
+        return _groupSet; 
     }
     
 }