X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=security%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsecurity%2Fauthorization%2FAuthorizationServiceTest.java;h=5ec36f7ec43b273e0d980a682125d10d4c67b57e;hb=0d8d8f24656e585ee75558cfd6a4c661f8f14985;hp=502000e61a5b4a3b15323a96e65dd1eb11615b73;hpb=bfdfe5ac1e02bff97a56e14f7ef790f67c407ae6;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 502000e6..5ec36f7e 100644
--- a/security/src/test/java/org/wamblee/security/authorization/AuthorizationServiceTest.java
+++ b/security/src/test/java/org/wamblee/security/authorization/AuthorizationServiceTest.java
@@ -20,9 +20,6 @@ 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.spring.SpringTestCase;
-import org.wamblee.test.spring.SpringConfigFiles;
 import org.wamblee.usermgt.UserAccessor;
 
 /**
@@ -32,13 +29,13 @@ import org.wamblee.usermgt.UserAccessor;
  */
 public class AuthorizationServiceTest extends TestCase {
     
-    private AuthorizationRule _rule1; 
-    private AuthorizationRule _rule2;  
-    private AuthorizationRule _rule3; 
-    private AuthorizationService _service; 
+    private AuthorizationRule rule1; 
+    private AuthorizationRule rule2;  
+    private AuthorizationRule rule3; 
+    private AuthorizationService service; 
     
     protected AuthorizationService getService() { 
-        return _service; 
+        return service; 
     }
     
     /* (non-Javadoc)
@@ -48,20 +45,20 @@ public class AuthorizationServiceTest extends TestCase {
     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() { 
@@ -99,16 +96,16 @@ public class AuthorizationServiceTest extends TestCase {
      *
      */
     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);
     }
     
     /**
@@ -116,10 +113,10 @@ public class AuthorizationServiceTest extends TestCase {
      *
      */
     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);
     }
     
     /**
@@ -127,10 +124,10 @@ public class AuthorizationServiceTest extends TestCase {
      *
      */
     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); 
     }
     
     /**
@@ -139,9 +136,9 @@ public class AuthorizationServiceTest extends TestCase {
      */
     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);
     }
     
@@ -151,9 +148,9 @@ public class AuthorizationServiceTest extends TestCase {
      */
     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);
             
     }
@@ -163,7 +160,7 @@ public class AuthorizationServiceTest extends TestCase {
      *
      */
     public void testGetRules() { 
-        AuthorizationRule[] rules = _service.getRules();
+        AuthorizationRule[] rules = service.getRules();
         assertEquals(3, rules.length); 
     }
     
@@ -172,9 +169,9 @@ public class AuthorizationServiceTest extends TestCase {
      *
      */
     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); 
     }
 }