git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Now added support for ProvidedInterfaces in Container.
[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..3d6f8c54d99a52f74db6ec84f1a9d31b21d68fa2 100644
(file)
--- a/
security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java
+++ b/
security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java
@@
-36,7
+36,6
@@
import org.wamblee.usermgt.InMemoryUserSetTest;
import org.wamblee.usermgt.User;
import org.wamblee.usermgt.UserMgtException;
import org.wamblee.usermgt.UserSet;
import org.wamblee.usermgt.User;
import org.wamblee.usermgt.UserMgtException;
import org.wamblee.usermgt.UserSet;
-import org.wamblee.usermgt.UsermgtHibernateMappingFiles;
import org.wamblee.usermgt.UsermgtSpringConfigFiles;
/**
import org.wamblee.usermgt.UsermgtSpringConfigFiles;
/**
@@
-54,15
+53,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
+73,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
+85,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;
}