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=aa0df19349b7edbc4aedb150862c95fc5ce3910b;hp=4fbef86e0c2ad11ed8add64c2fe042cdeefe9352;hpb=43995978f8779ea9fb686e8cb6f98516d8c2f2e5;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 4fbef86e..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.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); @@ -65,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(); } /** @@ -76,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; }