X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsecurity%2Fauthorization%2Fhibernate%2FPersistentAuthorizationServiceTest.java;h=b1a369347032d6122a01145543659a5afb5ab6ab;hb=0d8d8f24656e585ee75558cfd6a4c661f8f14985;hp=f55fc293865f9f3ae8bc86e47a81510bd0e71383;hpb=da48a523c81e59fe0eac34e43d12937396161f25;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 f55fc293..b1a36934 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
@@ -59,61 +59,61 @@ public class PersistentAuthorizationServiceTest extends
     private static final String PATHCOND_TABLE = "PATH_CONDITIONS";
     private static final String USERCOND_TABLE = "USER_CONDITIONS";
 
-    private DefaultContainer _container;
-    private Scope _scope;
+    private DefaultContainer container;
+    private Scope scope;
 
-    private DatabaseTesterComponent _databaseTester;
-    private UserAccessor _userAccessor;
-    private HibernateTemplate _hibernateTemplate;
-    private AuthorizationService _authorizationService;
+    private DatabaseTesterComponent databaseTester;
+    private UserAccessor userAccessor;
+    private HibernateTemplate hibernateTemplate;
+    private AuthorizationService authorizationService;
 
     @Override
     protected void setUp() throws Exception {
 
-        _container = new DefaultContainer("top");
-        DatabaseComponentFactory.addDatabaseConfig(_container);
-        _container.addComponent(new DatasourceComponent("datasource"));
+        container = new DefaultContainer("top");
+        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",
+        container.addComponent("userAccessor", useraccessorConfig);
+        container.addComponent(new AuthorizationComponent("authorization",
                 true));
 
         ClassConfiguration dbtesterConfig = new ClassConfiguration(
                 DatabaseTesterComponent.class);
         dbtesterConfig.getObjectConfig().getSetterConfig().initAllSetters();
-        _container.addComponent("databaseTester", dbtesterConfig);
+        container.addComponent("databaseTester", dbtesterConfig);
 
         ObjectConfiguration config = new ObjectConfiguration(
                 PersistentAuthorizationServiceTest.class);
         config.getSetterConfig().clear().add("setUserAccessor").add(
                 "setDatabaseTester").add("setHibernateTemplate").add(
                 "setAuthorizationService");
-        _container.addComponent("testcase", this, config);
+        container.addComponent("testcase", this, config);
 
-        _scope = _container.start();
+        scope = container.start();
 
-        _databaseTester.cleanDatabase();
+        databaseTester.cleanDatabase();
 
         super.setUp();
     }
 
     public void setDatabaseTester(DatabaseTesterComponent aDatabaseTester) {
-        _databaseTester = aDatabaseTester;
+        databaseTester = aDatabaseTester;
     }
 
     public void setUserAccessor(UserAccessor aUserAccessor) {
-        _userAccessor = aUserAccessor;
+        userAccessor = aUserAccessor;
     }
 
     public void setHibernateTemplate(HibernateTemplate aHibernateTemplate) {
-        _hibernateTemplate = aHibernateTemplate;
+        hibernateTemplate = aHibernateTemplate;
     }
 
     public void setAuthorizationService(
             AuthorizationService aAuthorizationService) {
-        _authorizationService = aAuthorizationService;
+        authorizationService = aAuthorizationService;
     }
 
     /*
@@ -126,7 +126,7 @@ public class PersistentAuthorizationServiceTest extends
     @Override
     protected AuthorizationService createService() {
         PersistentAuthorizationService service = new PersistentAuthorizationService(
-                "DEFAULT", _hibernateTemplate, createUserAccessor(), 10000);
+                "DEFAULT", hibernateTemplate, createUserAccessor(), 10000);
         return service;
     }
 
@@ -140,13 +140,13 @@ public class PersistentAuthorizationServiceTest extends
     @Override
     protected void checkRuleCount(int aCount) {
         try {
-            assertEquals(1, _databaseTester.getTableSize(SERVICE_TABLE));
-            assertEquals(aCount, _databaseTester.getTableSize(RULES_TABLE));
-            assertEquals(aCount, _databaseTester
+            assertEquals(1, databaseTester.getTableSize(SERVICE_TABLE));
+            assertEquals(aCount, databaseTester.getTableSize(RULES_TABLE));
+            assertEquals(aCount, databaseTester
                     .getTableSize(SERVICE_RULES_TABLE));
-            assertEquals(aCount, _databaseTester.getTableSize(USERCOND_TABLE));
-            assertEquals(aCount, _databaseTester.getTableSize(PATHCOND_TABLE));
-            assertEquals(aCount, _databaseTester
+            assertEquals(aCount, databaseTester.getTableSize(USERCOND_TABLE));
+            assertEquals(aCount, databaseTester.getTableSize(PATHCOND_TABLE));
+            assertEquals(aCount, databaseTester
                     .getTableSize(OPERATIONCOND_TABLE));
         } catch (SQLException e) {
             throw new RuntimeException(e);