git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
now linking required and provided interfaces only once.
[utils]
/
trunk
/
security
/
src
/
test
/
java
/
org
/
wamblee
/
usermgt
/
hibernate
/
HibernateUserAdministrationTest.java
diff --git
a/trunk/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java
b/trunk/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java
index 6480e77fe2d8506774f249a3a4a5d19cc97ec36b..5d604fc074f5e9f774450f8c5c563b29465bde6d 100644
(file)
--- a/
trunk/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java
+++ b/
trunk/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java
@@
-22,17
+22,17
@@
import java.sql.SQLException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
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.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.adapters.DefaultContainer;
import org.wamblee.system.adapters.ObjectConfiguration;
+import org.wamblee.system.components.DatabaseComponentFactory;
import org.wamblee.system.core.Scope;
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;
import org.wamblee.test.spring.TestTransactionCallbackWithoutResult;
import org.wamblee.usermgt.UserAdministration;
import org.wamblee.usermgt.UserAdministrationImplTest;
-import org.wamblee.usermgt.UsermgtSpringConfigFiles;
/**
* User administration tests with persistence based on Hibernate. This executes
/**
* User administration tests with persistence based on Hibernate. This executes
@@
-61,10
+61,13
@@
public class HibernateUserAdministrationTest extends UserAdministrationImplTest
protected void setUp() throws Exception {
_container = new DefaultContainer("top");
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(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);
ObjectConfiguration config = new ObjectConfiguration(
HibernateUserAdministrationTest.class);
@@
-92,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)
*