X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsecurity%2Fauthorization%2Fhibernate%2FPersistentAuthorizationServiceTest.java;h=2dcefee78715e77c4ceba8563b9050a0ca8041b2;hb=2d7b0cb1921d9b37821f7d838ab070f5394a6fa4;hp=04ca2d37a2ddb8d70869ee5d8bc8658076fdc636;hpb=39757b6f9c0a6521c82271e715e2446142cf67dd;p=utils 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 04ca2d37..2dcefee7 100644 --- 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();