X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fimpl%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsecurity%2Fauthorization%2FAuthorizationServiceTest.java;h=50c73dcace2ebf3b3055c96959353055f0bd2f41;hb=f4f8467b507b7bb401e4ad0749ea426208831846;hp=8be34f9da74d5204f4c5275984f5be6a77161f8d;hpb=571d83f35a06f57d65c155cf63237fea70f7b1b9;p=utils

diff --git a/security/impl/src/test/java/org/wamblee/security/authorization/AuthorizationServiceTest.java b/security/impl/src/test/java/org/wamblee/security/authorization/AuthorizationServiceTest.java
index 8be34f9d..50c73dca 100644
--- a/security/impl/src/test/java/org/wamblee/security/authorization/AuthorizationServiceTest.java
+++ b/security/impl/src/test/java/org/wamblee/security/authorization/AuthorizationServiceTest.java
@@ -19,7 +19,9 @@ import junit.framework.TestCase;
 import static org.wamblee.security.authorization.AuthorizationResult.DENIED;
 import static org.wamblee.security.authorization.AuthorizationResult.GRANTED;
 
-import org.wamblee.usermgt.UserAccessor;
+import org.junit.Ignore;
+import org.wamblee.security.authentication.UserAccessor;
+import org.wamblee.security.authentication.UserAdministration;
 
 /**
  * Tests the authorization service.
@@ -35,6 +37,9 @@ public class AuthorizationServiceTest extends TestCase {
 
     private AuthorizationService service;
 
+    private TestUserAccessor userAccessor;
+    
+
     protected AuthorizationService getService() {
         return service;
     }
@@ -48,6 +53,8 @@ public class AuthorizationServiceTest extends TestCase {
     protected void setUp() throws Exception {
         super.setUp();
 
+        userAccessor = new TestUserAccessor(); 
+        
         rule1 = createRule(GRANTED, "users", "/oni/", AllOperation.class);
         rule2 = createRule(DENIED, "users", "/abc/", ReadOperation.class);
         rule3 = createRule(GRANTED, "users", "/abc/", AllOperation.class);
@@ -56,6 +63,7 @@ public class AuthorizationServiceTest extends TestCase {
         service.appendRule(rule1);
         service.appendRule(rule2);
         service.appendRule(rule3);
+        checkRuleCount(3);
     }
 
     protected void resetTestRules() {
@@ -64,8 +72,12 @@ public class AuthorizationServiceTest extends TestCase {
         ((TestAuthorizationRule) rule3).reset();
     }
 
-    protected UserAccessor createUserAccessor() {
-        return new TestUserAccessor();
+    protected UserAccessor getUserAccessor() {
+        return userAccessor; 
+    }
+    
+    protected UserAdministration getUserAdministration() { 
+        return userAccessor.getUserAdmin();
     }
 
     /**
@@ -75,8 +87,8 @@ public class AuthorizationServiceTest extends TestCase {
      */
     protected AuthorizationService createService() {
         DefaultAuthorizationService service = new DefaultAuthorizationService();
-        service.setUserAccessor(createUserAccessor());
-
+        service.setUserAccessor(getUserAccessor());
+        service.setUserAdministration(getUserAdministration());
         return service;
     }