updated coding rules.

[utils] / security / src / test / java / org / wamblee / security / authorization / AuthorizationServiceTest.java

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 f3791a346d2df763e2b8124328d68b2be4227ac3..5ec36f7ec43b273e0d980a682125d10d4c67b57e 100644 (file)
--- a/security/src/test/java/org/wamblee/security/authorization/AuthorizationServiceTest.java
+++ b/security/src/test/java/org/wamblee/security/authorization/AuthorizationServiceTest.java
@@ -18,34 +18,24 @@ package org.wamblee.security.authorization;
 
 import static org.wamblee.security.authorization.AuthorizationResult.DENIED;
 import static org.wamblee.security.authorization.AuthorizationResult.GRANTED;
+import junit.framework.TestCase;
 
-import org.wamblee.persistence.hibernate.HibernateMappingFiles;
-import org.wamblee.test.SpringConfigFiles;
-import org.wamblee.test.SpringTestCase;
 import org.wamblee.usermgt.UserAccessor;
 
 /**
  * Tests the authorization service. 
+ *
+ * @author Erik Brakkee
  */
-public class AuthorizationServiceTest extends SpringTestCase {
+public class AuthorizationServiceTest extends TestCase {
     
-    private AuthorizationRule _rule1; 
-    private AuthorizationRule _rule2;  
-    private AuthorizationRule _rule3; 
-    private AuthorizationService _service; 
-    
-    
-    public AuthorizationServiceTest() { 
-        super(SpringConfigFiles.class, HibernateMappingFiles.class);
-    }
-    
-    public AuthorizationServiceTest(Class<? extends SpringConfigFiles>aSpringFiles, 
-            Class<? extends HibernateMappingFiles> aMappings) {
-        super(aSpringFiles, aMappings);
-    }
+    private AuthorizationRule rule1; 
+    private AuthorizationRule rule2;  
+    private AuthorizationRule rule3; 
+    private AuthorizationService service; 
     
     protected AuthorizationService getService() { 
-        return _service; 
+        return service; 
     }
     
     /* (non-Javadoc)
@@ -55,20 +45,20 @@ public class AuthorizationServiceTest extends SpringTestCase {
     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.appendRule(_rule1); 
-        _service.appendRule(_rule2);
-        _service.appendRule(_rule3);
+        service = createService(); 
+        service.appendRule(rule1); 
+        service.appendRule(rule2);
+        service.appendRule(rule3);
     }
     
     protected void resetTestRules() { 
-        ((TestAuthorizationRule)_rule1).reset(); 
-        ((TestAuthorizationRule)_rule2).reset(); 
-        ((TestAuthorizationRule)_rule3).reset(); 
+        ((TestAuthorizationRule)rule1).reset(); 
+        ((TestAuthorizationRule)rule2).reset(); 
+        ((TestAuthorizationRule)rule3).reset(); 
     }
     
     protected UserAccessor createUserAccessor() { 
@@ -106,16 +96,16 @@ public class AuthorizationServiceTest extends SpringTestCase {
      *
      */
     public void testFirstRuleGrants() { 
-        assertTrue( _service.isAllowed(createResource("/oni/xyz.jpg"), new ReadOperation())); 
-        checkMatchCount(1, _rule1);
-        assertTrue(_service.isAllowed(createResource("/oni/xyz.jpg"), new WriteOperation())); 
-        checkMatchCount(2, _rule1);
-        assertTrue(_service.isAllowed(createResource("/oni/xyz.jpg"), new DeleteOperation())); 
-        checkMatchCount(3, _rule1);
-        assertTrue(_service.isAllowed(createResource("/oni/xyz.jpg"), new CreateOperation())); 
-        checkMatchCount(4, _rule1);
-        checkMatchCount(0, _rule2);
-        checkMatchCount(0, _rule3);
+        assertTrue( service.isAllowed(createResource("/oni/xyz.jpg"), new ReadOperation())); 
+        checkMatchCount(1, rule1);
+        assertTrue(service.isAllowed(createResource("/oni/xyz.jpg"), new WriteOperation())); 
+        checkMatchCount(2, rule1);
+        assertTrue(service.isAllowed(createResource("/oni/xyz.jpg"), new DeleteOperation())); 
+        checkMatchCount(3, rule1);
+        assertTrue(service.isAllowed(createResource("/oni/xyz.jpg"), new CreateOperation())); 
+        checkMatchCount(4, rule1);
+        checkMatchCount(0, rule2);
+        checkMatchCount(0, rule3);
     }
     
     /**
@@ -123,10 +113,10 @@ public class AuthorizationServiceTest extends SpringTestCase {
      *
      */
     public void testSecondRuleDenies() {
-        assertFalse(_service.isAllowed(createResource("/abc/xyz.jpg"), new ReadOperation())); 
-        checkMatchCount(0, _rule1);
-        checkMatchCount(1, _rule2);
-        checkMatchCount(0, _rule3);
+        assertFalse(service.isAllowed(createResource("/abc/xyz.jpg"), new ReadOperation())); 
+        checkMatchCount(0, rule1);
+        checkMatchCount(1, rule2);
+        checkMatchCount(0, rule3);
     }
     
     /**
@@ -134,10 +124,10 @@ public class AuthorizationServiceTest extends SpringTestCase {
      *
      */
     public void testThirdRuleGrants() { 
-        assertTrue(_service.isAllowed(createResource("/abc/xyz.jpg"), new WriteOperation())); 
-        checkMatchCount(0, _rule1); 
-        checkMatchCount(0, _rule2);
-        checkMatchCount(1, _rule3); 
+        assertTrue(service.isAllowed(createResource("/abc/xyz.jpg"), new WriteOperation())); 
+        checkMatchCount(0, rule1); 
+        checkMatchCount(0, rule2);
+        checkMatchCount(1, rule3); 
     }
     
     /**
@@ -146,9 +136,9 @@ public class AuthorizationServiceTest extends SpringTestCase {
      */
     public void testRemoveRule() { 
         checkRuleCount(3);
-        assertTrue(_service.isAllowed(createResource("/abc/xyz.jpg"), new WriteOperation())); 
-        _service.removeRule(2); 
-        assertFalse(_service.isAllowed(createResource("/abc/xyz.jpg"), new WriteOperation()));
+        assertTrue(service.isAllowed(createResource("/abc/xyz.jpg"), new WriteOperation())); 
+        service.removeRule(2); 
+        assertFalse(service.isAllowed(createResource("/abc/xyz.jpg"), new WriteOperation()));
         checkRuleCount(2);
     }
     
@@ -158,9 +148,9 @@ public class AuthorizationServiceTest extends SpringTestCase {
      */
     public void testInsertRule() {
         checkRuleCount(3);
-        assertFalse(_service.isAllowed(createResource("/janse/xyz.jpg"), new WriteOperation()));     
-        _service.appendRule(createRule(GRANTED, "users", "/janse/", WriteOperation.class));
-        assertTrue(_service.isAllowed(createResource("/janse/xyz.jpg"), new WriteOperation()));
+        assertFalse(service.isAllowed(createResource("/janse/xyz.jpg"), new WriteOperation()));     
+        service.appendRule(createRule(GRANTED, "users", "/janse/", WriteOperation.class));
+        assertTrue(service.isAllowed(createResource("/janse/xyz.jpg"), new WriteOperation()));
         checkRuleCount(4);
             
     }
@@ -170,7 +160,7 @@ public class AuthorizationServiceTest extends SpringTestCase {
      *
      */
     public void testGetRules() { 
-        AuthorizationRule[] rules = _service.getRules();
+        AuthorizationRule[] rules = service.getRules();
         assertEquals(3, rules.length); 
     }
     
@@ -179,9 +169,9 @@ public class AuthorizationServiceTest extends SpringTestCase {
      *
      */
     public void testNoRulesSupportResource() { 
-        assertFalse(_service.isAllowed(createResource("/xyxyxyxy"), new ReadOperation()));
-        checkMatchCount(0, _rule1); 
-        checkMatchCount(0, _rule2);
-        checkMatchCount(0, _rule3); 
+        assertFalse(service.isAllowed(createResource("/xyxyxyxy"), new ReadOperation()));
+        checkMatchCount(0, rule1); 
+        checkMatchCount(0, rule2);
+        checkMatchCount(0, rule3); 
     }
 }