X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fusermgt%2Fhibernate%2FHibernateUserSetTest.java;h=6b7dc38a1f2581f7b0699f00234ffb445d8a3828;hb=604319a397eeb71db767a79487f2848dd91e49de;hp=9ba3a58e257fd98f8e01bf9ea04d25d05ccae890;hpb=a463ceba6a90580875dc7cff4674f461a3db773f;p=utils

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 9ba3a58e..6b7dc38a 100644
--- a/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java
+++ b/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java
@@ -21,23 +21,17 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Set;
 
-import javax.sql.DataSource;
-
-import org.wamblee.cache.Cache;
 import org.wamblee.cache.EhCache;
-import org.wamblee.general.BeanKernel;
 import org.wamblee.system.adapters.DefaultContainer;
 import org.wamblee.system.adapters.ObjectConfiguration;
 import org.wamblee.system.core.Scope;
-import org.wamblee.system.spring.DatabaseTesterComponent;
+import org.wamblee.system.spring.component.DatabaseTesterComponent;
 import org.wamblee.usermgt.Group;
 import org.wamblee.usermgt.GroupSet;
 import org.wamblee.usermgt.InMemoryUserSetTest;
 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;
 
 /**
  * Tests for {@link org.wamblee.usermgt.hibernate.HibernateGroupSet}
@@ -54,15 +48,9 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
     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 DataSource _datasource;
+    
     private UserSet _userset;
     private GroupSet _groupset;
     private EhCache<Serializable, Serializable> _userCache;
@@ -76,19 +64,11 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
     @Override
     protected void setUp() throws Exception {
 
-        _container = new DefaultContainer("top");
-        _container.addComponent(new ExternalDatasourceComponent("datasource"));
-        _container.addComponent("mappingFiles",
-                new UsermgtHibernateMappingFiles());
-        _container.addComponent(new HibernateComponent("hibernate"));
-        _container
-                .addComponent(new UserGroupRepositoryComponent("usersgroups"));
-        _container
-                .addComponent("databaseTester", DatabaseTesterComponent.class);
-
+        _container = new UserMgtRepositoryTestContainer("top");
+       
         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);
 
@@ -100,10 +80,6 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
         super.setUp();
     }
 
-    public void setDatasource(DataSource aDatasource) {
-        _datasource = aDatasource;
-    }
-
     public void setUserset(UserSet aUserset) {
         _userset = aUserset;
     }