X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fusermgt%2Fhibernate%2FHibernateUserAdministrationTest.java;h=08ec4ae99bce41072161cd533a07b940018f80ee;hb=0d8d8f24656e585ee75558cfd6a4c661f8f14985;hp=d0fc434ab11f4f06196d496dbd19e6a3e29f2c59;hpb=b7f387ca0178938325ce7107222188d3912fc1cb;p=utils

diff --git a/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java b/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java
index d0fc434a..08ec4ae9 100644
--- a/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java
+++ b/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java
@@ -22,18 +22,17 @@ import java.sql.SQLException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wamblee.cache.Cache;
 import org.wamblee.cache.EhCache;
-import org.wamblee.general.BeanKernel;
+import org.wamblee.system.adapters.ClassConfiguration;
 import org.wamblee.system.adapters.DefaultContainer;
 import org.wamblee.system.adapters.ObjectConfiguration;
+import org.wamblee.system.components.DatabaseComponentFactory;
 import org.wamblee.system.core.Scope;
-import org.wamblee.system.spring.DatabaseTesterComponent;
+import org.wamblee.system.spring.component.DatabaseTesterComponent;
+import org.wamblee.system.spring.component.DatasourceComponent;
 import org.wamblee.test.spring.TestTransactionCallbackWithoutResult;
 import org.wamblee.usermgt.UserAdministration;
-import org.wamblee.usermgt.UserAdministrationComponent;
 import org.wamblee.usermgt.UserAdministrationImplTest;
-import org.wamblee.usermgt.UsermgtSpringConfigFiles;
 
 /**
  * User administration tests with persistence based on Hibernate. This executes
@@ -47,12 +46,12 @@ public class HibernateUserAdministrationTest extends UserAdministrationImplTest
     
     private static final Log LOG = LogFactory.getLog(HibernateUserAdministrationTest.class);
 
-    private DefaultContainer _container;
-    private Scope _scope;
+    private DefaultContainer container;
+    private Scope scope;
     
-    private DatabaseTesterComponent _databaseTester;
-    private EhCache<Serializable, Serializable> _userCache;
-    private UserAdministration _userAdmin; 
+    private DatabaseTesterComponent databaseTester;
+    private EhCache<Serializable, Serializable> userCache;
+    private UserAdministration userAdmin; 
     
     
     /* (non-Javadoc)
@@ -61,36 +60,45 @@ public class HibernateUserAdministrationTest extends UserAdministrationImplTest
     @Override
     protected void setUp() throws Exception {
         
-        _container = new DefaultContainer("top");
-        _container.addComponent(new ExternalDatasourceComponent("datasource"));
-        _container.addComponent(new UserAdministrationComponent("admin", true));
+        container = new DefaultContainer("top");
+        DatabaseComponentFactory.addDatabaseConfig(container);
+        container.addComponent(new DatasourceComponent("datasource"));
+        container.addComponent(new UserAdministrationComponent("admin", true));
         
-        _container.addComponent("databaseTester", DatabaseTesterComponent.class);
+        ClassConfiguration dbtesterConfig = new ClassConfiguration(DatabaseTesterComponent.class); 
+        dbtesterConfig.getObjectConfig().getSetterConfig().initAllSetters();
+        container.addComponent("databaseTester", dbtesterConfig);
         
         ObjectConfiguration config = new ObjectConfiguration(
                 HibernateUserAdministrationTest.class);
         config.getSetterConfig().clear().add(
-                "userCache").add("databaseTester").add("userAdmin");
-        _container.addComponent("testcase", this, config);
+                "setUserCache").add("setDatabaseTester").add("setUserAdmin");
+        container.addComponent("testcase", this, config);
 
-        _scope = _container.start();
+        scope = container.start();
 
-        _databaseTester.cleanDatabase();
+        databaseTester.cleanDatabase();
        
         super.setUp();
         clearUserCache();
     }
     
     public void setUserCache(EhCache<Serializable, Serializable> aUserCache) {
-        _userCache = aUserCache;
+        userCache = aUserCache;
     }
     
     public void setDatabaseTester(DatabaseTesterComponent aDatabaseTester) {
-        _databaseTester = aDatabaseTester;
+        databaseTester = aDatabaseTester;
     }
     
     public void setUserAdmin(UserAdministration aUserAdmin) {
-        _userAdmin = aUserAdmin;
+        userAdmin = aUserAdmin;
+    }
+
+    @Override
+    protected void tearDown()  throws Exception { 
+        container.stop(scope);
+        super.tearDown();
     }
 
     /*
@@ -100,7 +108,7 @@ public class HibernateUserAdministrationTest extends UserAdministrationImplTest
      */
     @Override
     protected UserAdministration createAdmin() {
-        return _userAdmin;
+        return userAdmin;
     }
 
     public void testAllTestsInASeparateTransaction() throws SQLException {
@@ -108,9 +116,9 @@ public class HibernateUserAdministrationTest extends UserAdministrationImplTest
         Method[] methods = UserAdministrationImplTest.class.getMethods();
         for (final Method method : methods) {
             if (method.getName().startsWith("test")) {
-                _databaseTester.cleanDatabase();
+                databaseTester.cleanDatabase();
                 clearUserCache();
-                _databaseTester.executeTransaction(new TestTransactionCallbackWithoutResult() {
+                databaseTester.executeTransaction(new TestTransactionCallbackWithoutResult() {
                     public void execute() throws Exception {
                         LOG.info("Running test " + method.getName());
                         try {
@@ -133,6 +141,6 @@ public class HibernateUserAdministrationTest extends UserAdministrationImplTest
      * 
      */
     private void clearUserCache() {
-        _userCache.clear();
+        userCache.clear();
     }
 }