git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[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 a0fd837c10e689ee369eb235490df107ce7908a7..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.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.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.component.DatabaseTesterComponent;
import org.wamblee.system.core.Scope;
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;
import org.wamblee.test.spring.TestTransactionCallbackWithoutResult;
import org.wamblee.usermgt.UserAdministration;
import org.wamblee.usermgt.UserAdministrationImplTest;
@@
-62,12
+65,14
@@
public class HibernateUserAdministrationTest extends UserAdministrationImplTest
_container.addComponent(new DatasourceComponent("datasource"));
_container.addComponent(new UserAdministrationComponent("admin", true));
_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(
ObjectConfiguration config = new ObjectConfiguration(
HibernateUserAdministrationTest.class);
config.getSetterConfig().clear().add(
- "
userCache").add("databaseTester").add("u
serAdmin");
+ "
setUserCache").add("setDatabaseTester").add("setU
serAdmin");
_container.addComponent("testcase", this, config);
_scope = _container.start();
_container.addComponent("testcase", this, config);
_scope = _container.start();
@@
-90,6
+95,12
@@
public class HibernateUserAdministrationTest extends UserAdministrationImplTest
_userAdmin = aUserAdmin;
}
_userAdmin = aUserAdmin;
}
+ @Override
+ protected void tearDown() throws Exception {
+ _container.stop(_scope);
+ super.tearDown();
+ }
+
/*
* (non-Javadoc)
*
/*
* (non-Javadoc)
*