(no commit message)

[utils] / security / src / test / java / org / wamblee / security / authorization / hibernate / PersistentAuthorizationServiceTest.java

diff --git a/security/src/test/java/org/wamblee/security/authorization/hibernate/PersistentAuthorizationServiceTest.java b/security/src/test/java/org/wamblee/security/authorization/hibernate/PersistentAuthorizationServiceTest.java
index 04ca2d37a2ddb8d70869ee5d8bc8658076fdc636..2dcefee78715e77c4ceba8563b9050a0ca8041b2 100644 (file)
--- a/security/src/test/java/org/wamblee/security/authorization/hibernate/PersistentAuthorizationServiceTest.java
+++ b/security/src/test/java/org/wamblee/security/authorization/hibernate/PersistentAuthorizationServiceTest.java
@@ -24,13 +24,16 @@ import org.wamblee.general.BeanKernel;
 import org.wamblee.security.authorization.AuthorizationService;
 import org.wamblee.security.authorization.AuthorizationServiceTest;
 import org.wamblee.security.authorization.TestUserAccessor;
+import org.wamblee.system.adapters.ClassConfiguration;
+import org.wamblee.system.adapters.ClassConfigurationTest;
 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.usermgt.UserAccessor;
 import org.wamblee.usermgt.hibernate.AuthorizationComponent;
-import org.wamblee.usermgt.hibernate.ExternalDatasourceComponent;
 import org.wamblee.usermgt.hibernate.HibernateUserAdministrationTest;
 import org.wamblee.usermgt.hibernate.UserAdministrationComponent;
 
@@ -64,19 +67,25 @@ public class PersistentAuthorizationServiceTest extends
     protected void setUp() throws Exception {
 
         _container = new DefaultContainer("top");
-        _container.addComponent(new ExternalDatasourceComponent("datasource"));
-        _container.addComponent("userAccessor", TestUserAccessor.class);
+        DatabaseComponentFactory.addDatabaseConfig(_container);
+        _container.addComponent(new DatasourceComponent("datasource"));
+        ClassConfiguration useraccessorConfig = new ClassConfiguration(TestUserAccessor.class); 
+        useraccessorConfig.getObjectConfig().getSetterConfig().initAllSetters();
+        _container.addComponent("userAccessor", useraccessorConfig);
         _container.addComponent(new AuthorizationComponent("authorization",
                 true));
 
+        
+        ClassConfiguration dbtesterConfig = new ClassConfiguration(DatabaseTesterComponent.class); 
+        dbtesterConfig.getObjectConfig().getSetterConfig().initAllSetters();
         _container
-                .addComponent("databaseTester", DatabaseTesterComponent.class);
+                .addComponent("databaseTester", dbtesterConfig);
 
         ObjectConfiguration config = new ObjectConfiguration(
                 PersistentAuthorizationServiceTest.class);
-        config.getSetterConfig().clear().add("userAccessor").add(
-                "databaseTester").add("hibernateTemplate").add(
-                "authorizationService");
+        config.getSetterConfig().clear().add("setUserAccessor").add(
+                "setDatabaseTester").add("setHibernateTemplate").add(
+                "setAuthorizationService");
         _container.addComponent("testcase", this, config);
 
         _scope = _container.start();