[maven-release-plugin] copy for tag wamblee-utils-0.2.2

[utils] / security / src / test / java / org / wamblee / usermgt / hibernate / HibernateUserAdministrationTest.java

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 90a5cc9c5663244cb8c4a6e7b067febf03010fba..f707dba008ae8ead2c305b9c2cece9603e174675 100644 (file)
--- a/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java
+++ b/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java
@@ -23,10 +23,13 @@ import java.sql.SQLException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wamblee.cache.EhCache;
+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.UserAdministrationImplTest;
@@ -58,15 +61,18 @@ public class HibernateUserAdministrationTest extends UserAdministrationImplTest
     protected void setUp() throws Exception {
         
         _container = new DefaultContainer("top");
-        _container.addComponent(new ExternalDatasourceComponent("datasource"));
+        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");
+                "setUserCache").add("setDatabaseTester").add("setUserAdmin");
         _container.addComponent("testcase", this, config);
 
         _scope = _container.start();
@@ -89,6 +95,12 @@ public class HibernateUserAdministrationTest extends UserAdministrationImplTest
         _userAdmin = aUserAdmin;
     }
 
+    @Override
+    protected void tearDown()  throws Exception { 
+        _container.stop(_scope);
+        super.tearDown();
+    }
+
     /*
      * (non-Javadoc)
      *