X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fimpl%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsecurity%2Fauthorization%2FUrlAuthorizationRuleTest.java;h=8625f9edddfcb34c363f4d2fc018f86ab22bd652;hb=aa0df19349b7edbc4aedb150862c95fc5ce3910b;hp=b2353b89f9a1286591fab1259fddb3584beaa7e3;hpb=4565fa62b5e77ce0ffbac381bc0ef1813da94af7;p=utils

diff --git a/security/impl/src/test/java/org/wamblee/security/authorization/UrlAuthorizationRuleTest.java b/security/impl/src/test/java/org/wamblee/security/authorization/UrlAuthorizationRuleTest.java
index b2353b89..8625f9ed 100644
--- a/security/impl/src/test/java/org/wamblee/security/authorization/UrlAuthorizationRuleTest.java
+++ b/security/impl/src/test/java/org/wamblee/security/authorization/UrlAuthorizationRuleTest.java
@@ -20,7 +20,7 @@ import static org.wamblee.security.authorization.AuthorizationResult.GRANTED;
 import static org.wamblee.security.authorization.AuthorizationResult.UNDECIDED;
 import static org.wamblee.security.authorization.AuthorizationResult.UNSUPPORTED_RESOURCE;
 
-import org.wamblee.usermgt.User;
+import org.wamblee.security.authentication.User;
 
 /**
  * Tests for the {@link org.wamblee.security.authorization.UrlAuthorizationRule}
@@ -29,6 +29,14 @@ import org.wamblee.usermgt.User;
  * @author Erik Brakkee
  */
 public class UrlAuthorizationRuleTest extends TestCase {
+    
+    private TestUserAccessor userAccessor; 
+    
+    public void setUp() { 
+        userAccessor = new TestUserAccessor(); 
+        
+    }
+    
     /**
      * Constructs the rule with a result of UNDECIDED. Verifies that an
      * IllegalArgumentException is thrown.
@@ -64,14 +72,16 @@ public class UrlAuthorizationRuleTest extends TestCase {
     public void testUnsupportedObject() {
         AuthorizationRule rule = new TestAuthorizationRule(GRANTED, "users",
             "/path", ReadOperation.class);
+        rule.setUserAdministration(userAccessor.getUserAdmin());
         assertEquals(UNSUPPORTED_RESOURCE, rule.isAllowed("hello",
-            new ReadOperation(), new TestUserAccessor().getCurrentUser()));
+            new ReadOperation(), userAccessor.getCurrentUser()));
     }
 
     public void testMatchingScenarios() {
         AuthorizationRule rule = new TestAuthorizationRule(GRANTED, "users",
             "/path/", ReadOperation.class);
-        User user = new TestUserAccessor().getCurrentUser();
+        rule.setUserAdministration(userAccessor.getUserAdmin());
+        String user = userAccessor.getCurrentUser();
 
         // everything matches
         assertEquals(GRANTED, rule.isAllowed(new TestResource("/path/a"),
@@ -90,6 +100,7 @@ public class UrlAuthorizationRuleTest extends TestCase {
         // group does not match.
         AuthorizationRule rule2 = new TestAuthorizationRule(GRANTED, "users2",
             "/path/", ReadOperation.class);
+        rule2.setUserAdministration(userAccessor.getUserAdmin());
         assertEquals(UNDECIDED, rule2.isAllowed(new TestResource("/path/a"),
             new ReadOperation(), user));
     }