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.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;
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)
@Override
protected void setUp() throws Exception {
- _container = new DefaultContainer("top");
- DatabaseComponentFactory.addDatabaseConfig(_container);
- _container.addComponent(new DatasourceComponent("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();
}
/*
*/
@Override
protected UserAdministration createAdmin() {
- return _userAdmin;
+ return userAdmin;
}
public void testAllTestsInASeparateTransaction() throws SQLException {
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 {
*
*/
private void clearUserCache() {
- _userCache.clear();
+ userCache.clear();
}
}