git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
HibernateGroupSet no longer depends on SpringTestCase.
[utils]
/
security
/
src
/
test
/
java
/
org
/
wamblee
/
usermgt
/
hibernate
/
HibernateUserSetTest.java
diff --git
a/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java
b/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java
index 30a7acc4b7e8191ec0358b320304bb036ded4b8e..22ed9cd524636dca999759fa85365bc54177aba8 100644
(file)
--- a/
security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java
+++ b/
security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java
@@
-54,15
+54,9
@@
public class HibernateUserSetTest extends InMemoryUserSetTest {
private static final String GROUP_QUERY = "select * from " + GROUP_TABLE
+ " where name = ?";
private static final String GROUP_QUERY = "select * from " + GROUP_TABLE
+ " where name = ?";
- public HibernateUserSetTest() {
- super(UsermgtSpringConfigFiles.class,
- UsermgtHibernateMappingFiles.class);
- }
-
private DefaultContainer _container;
private Scope _scope;
private DefaultContainer _container;
private Scope _scope;
-
- private DataSource _datasource;
+
private UserSet _userset;
private GroupSet _groupset;
private EhCache<Serializable, Serializable> _userCache;
private UserSet _userset;
private GroupSet _groupset;
private EhCache<Serializable, Serializable> _userCache;
@@
-80,7
+74,7
@@
public class HibernateUserSetTest extends InMemoryUserSetTest {
ObjectConfiguration config = new ObjectConfiguration(
HibernateUserSetTest.class);
ObjectConfiguration config = new ObjectConfiguration(
HibernateUserSetTest.class);
- config.getSetterConfig().clear().add("
datasource").add("
userset").add(
+ config.getSetterConfig().clear().add("userset").add(
"groupset").add("databaseTester").add("userCache");
_container.addComponent("testcase", this, config);
"groupset").add("databaseTester").add("userCache");
_container.addComponent("testcase", this, config);
@@
-92,10
+86,6
@@
public class HibernateUserSetTest extends InMemoryUserSetTest {
super.setUp();
}
super.setUp();
}
- public void setDatasource(DataSource aDatasource) {
- _datasource = aDatasource;
- }
-
public void setUserset(UserSet aUserset) {
_userset = aUserset;
}
public void setUserset(UserSet aUserset) {
_userset = aUserset;
}