X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsecurity%2Fauthorization%2FAuthorizationServiceTest.java;h=bf5a5624327267bc117c9656ae07704dd83e914a;hb=8de36ff0206c996baf3ee4adc3e2293b12ff5f39;hp=fcc29344171e81d28e9f5b8d8566564ec6fc8c80;hpb=89c06d4d52b46c154128c97d6e758fa1f4fc7a6e;p=utils

diff --git a/security/src/test/java/org/wamblee/security/authorization/AuthorizationServiceTest.java b/security/src/test/java/org/wamblee/security/authorization/AuthorizationServiceTest.java
index fcc29344..bf5a5624 100644
--- a/security/src/test/java/org/wamblee/security/authorization/AuthorizationServiceTest.java
+++ b/security/src/test/java/org/wamblee/security/authorization/AuthorizationServiceTest.java
@@ -21,85 +21,56 @@ import static org.wamblee.security.authorization.AuthorizationResult.GRANTED;
 
 import org.wamblee.usermgt.UserAccessor;
 
-
 /**
  * Tests the authorization service.
- *
+ * 
  * @author Erik Brakkee
  */
 public class AuthorizationServiceTest extends TestCase {
-    /**
-     * DOCUMENT ME!
-     */
     private AuthorizationRule rule1;
 
-    /**
-     * DOCUMENT ME!
-     */
     private AuthorizationRule rule2;
 
-    /**
-     * DOCUMENT ME!
-     */
     private AuthorizationRule rule3;
 
-    /**
-     * DOCUMENT ME!
-     */
     private AuthorizationService service;
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
     protected AuthorizationService getService() {
         return service;
     }
 
-    /* (non-Javadoc)
+    /*
+     * (non-Javadoc)
+     * 
      * @see junit.framework.TestCase#setUp()
      */
-    /**
-     * DOCUMENT ME!
-     *
-     * @throws Exception DOCUMENT ME!
-     */
     @Override
     protected void setUp() throws Exception {
         super.setUp();
 
-        rule1       = createRule(GRANTED, "users", "/oni/", AllOperation.class);
-        rule2       = createRule(DENIED, "users", "/abc/", ReadOperation.class);
-        rule3       = createRule(GRANTED, "users", "/abc/", AllOperation.class);
+        rule1 = createRule(GRANTED, "users", "/oni/", AllOperation.class);
+        rule2 = createRule(DENIED, "users", "/abc/", ReadOperation.class);
+        rule3 = createRule(GRANTED, "users", "/abc/", AllOperation.class);
 
-        service     = createService();
+        service = createService();
         service.appendRule(rule1);
         service.appendRule(rule2);
         service.appendRule(rule3);
     }
 
-    /**
-     * DOCUMENT ME!
-     */
     protected void resetTestRules() {
         ((TestAuthorizationRule) rule1).reset();
         ((TestAuthorizationRule) rule2).reset();
         ((TestAuthorizationRule) rule3).reset();
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
     protected UserAccessor createUserAccessor() {
         return new TestUserAccessor();
     }
 
     /**
      * Creates an authorization service with some rules for testing. .
-     *
+     * 
      * @return Authorization service.
      */
     protected AuthorizationService createService() {
@@ -109,67 +80,38 @@ public class AuthorizationServiceTest extends TestCase {
         return service;
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param aResult DOCUMENT ME!
-     * @param aGroup DOCUMENT ME!
-     * @param aPath DOCUMENT ME!
-     * @param aOperation DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
     protected AuthorizationRule createRule(AuthorizationResult aResult,
-        String aGroup, String aPath, Class<?extends Operation> aOperation) {
+        String aGroup, String aPath, Class<? extends Operation> aOperation) {
         return new TestAuthorizationRule(aResult, aGroup, aPath, aOperation);
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param aCount DOCUMENT ME!
-     * @param aRule DOCUMENT ME!
-     */
     protected void checkMatchCount(int aCount, AuthorizationRule aRule) {
         assertEquals(aCount, ((TestAuthorizationRule) aRule).getMatchCount());
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param aPath DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
     protected Object createResource(String aPath) {
         return new TestResource(aPath);
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param aCount DOCUMENT ME!
-     */
     protected void checkRuleCount(int aCount) {
         // Empty
     }
 
     /**
-     * Several checks to verify the outcome of matching against the
-     * first rule.
+     * Several checks to verify the outcome of matching against the first rule.
      */
     public void testFirstRuleGrants() {
         assertTrue(service.isAllowed(createResource("/oni/xyz.jpg"),
-                new ReadOperation()));
+            new ReadOperation()));
         checkMatchCount(1, rule1);
         assertTrue(service.isAllowed(createResource("/oni/xyz.jpg"),
-                new WriteOperation()));
+            new WriteOperation()));
         checkMatchCount(2, rule1);
         assertTrue(service.isAllowed(createResource("/oni/xyz.jpg"),
-                new DeleteOperation()));
+            new DeleteOperation()));
         checkMatchCount(3, rule1);
         assertTrue(service.isAllowed(createResource("/oni/xyz.jpg"),
-                new CreateOperation()));
+            new CreateOperation()));
         checkMatchCount(4, rule1);
         checkMatchCount(0, rule2);
         checkMatchCount(0, rule3);
@@ -181,19 +123,19 @@ public class AuthorizationServiceTest extends TestCase {
      */
     public void testSecondRuleDenies() {
         assertFalse(service.isAllowed(createResource("/abc/xyz.jpg"),
-                new ReadOperation()));
+            new ReadOperation()));
         checkMatchCount(0, rule1);
         checkMatchCount(1, rule2);
         checkMatchCount(0, rule3);
     }
 
     /**
-     * Verifies that the third rule is used when appropriate and that
-     * it grants access.
+     * Verifies that the third rule is used when appropriate and that it grants
+     * access.
      */
     public void testThirdRuleGrants() {
         assertTrue(service.isAllowed(createResource("/abc/xyz.jpg"),
-                new WriteOperation()));
+            new WriteOperation()));
         checkMatchCount(0, rule1);
         checkMatchCount(0, rule2);
         checkMatchCount(1, rule3);
@@ -205,10 +147,10 @@ public class AuthorizationServiceTest extends TestCase {
     public void testRemoveRule() {
         checkRuleCount(3);
         assertTrue(service.isAllowed(createResource("/abc/xyz.jpg"),
-                new WriteOperation()));
+            new WriteOperation()));
         service.removeRule(2);
         assertFalse(service.isAllowed(createResource("/abc/xyz.jpg"),
-                new WriteOperation()));
+            new WriteOperation()));
         checkRuleCount(2);
     }
 
@@ -218,11 +160,11 @@ public class AuthorizationServiceTest extends TestCase {
     public void testInsertRule() {
         checkRuleCount(3);
         assertFalse(service.isAllowed(createResource("/janse/xyz.jpg"),
-                new WriteOperation()));
+            new WriteOperation()));
         service.appendRule(createRule(GRANTED, "users", "/janse/",
-                WriteOperation.class));
+            WriteOperation.class));
         assertTrue(service.isAllowed(createResource("/janse/xyz.jpg"),
-                new WriteOperation()));
+            new WriteOperation()));
         checkRuleCount(4);
     }
 
@@ -239,7 +181,7 @@ public class AuthorizationServiceTest extends TestCase {
      */
     public void testNoRulesSupportResource() {
         assertFalse(service.isAllowed(createResource("/xyxyxyxy"),
-                new ReadOperation()));
+            new ReadOperation()));
         checkMatchCount(0, rule1);
         checkMatchCount(0, rule2);
         checkMatchCount(0, rule3);