[jboss-cvs] JBossAS SVN: r69117 - in projects/security/security-jboss-sx/trunk/identity/src: tests/org/jboss/test/identity/impl and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2008-01-18 11:54:33 -0500 (Fri, 18 Jan 2008)
New Revision: 69117

Modified:
   projects/security/security-jboss-sx/trunk/identity/src/main/org/jboss/security/identity/plugins/SimpleRole.java
   projects/security/security-jboss-sx/trunk/identity/src/tests/org/jboss/test/identity/impl/RoleGroupUnitTestCase.java
Log:
handle anybody role

Modified: projects/security/security-jboss-sx/trunk/identity/src/main/org/jboss/security/identity/plugins/SimpleRole.java
===================================================================
--- projects/security/security-jboss-sx/trunk/identity/src/main/org/jboss/security/identity/plugins/SimpleRole.java	2008-01-18 16:38:16 UTC (rev 69116)
+++ projects/security/security-jboss-sx/trunk/identity/src/main/org/jboss/security/identity/plugins/SimpleRole.java	2008-01-18 16:54:33 UTC (rev 69117)
@@ -39,6 +39,7 @@
    private static final long serialVersionUID = 1L;
    private String roleName;
    
+   public static final Role ANYBODY_ROLE = new SimpleRole("<ANYBODY>");
    public static final String ANYBODY = "<ANYBODY>";
 
    public SimpleRole(String roleName)
@@ -63,8 +64,8 @@
    {
       if(anotherRole.getType() == RoleType.simple)
       {
-         if(ANYBODY.equals(roleName))
-            return true;
+         if(ANYBODY.equals(roleName) || ANYBODY.equals(anotherRole.getRoleName()))
+            return true; 
          return roleName.equals(anotherRole.getRoleName()); 
       }
       return false; 

Modified: projects/security/security-jboss-sx/trunk/identity/src/tests/org/jboss/test/identity/impl/RoleGroupUnitTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/identity/src/tests/org/jboss/test/identity/impl/RoleGroupUnitTestCase.java	2008-01-18 16:38:16 UTC (rev 69116)
+++ projects/security/security-jboss-sx/trunk/identity/src/tests/org/jboss/test/identity/impl/RoleGroupUnitTestCase.java	2008-01-18 16:54:33 UTC (rev 69117)
@@ -21,6 +21,7 @@
   */
 package org.jboss.test.identity.impl;
 
+import org.jboss.security.identity.Role;
 import org.jboss.security.identity.plugins.SimpleRole;
 import org.jboss.security.identity.plugins.SimpleRoleGroup;
 
@@ -39,9 +40,14 @@
 
    public void testAnybodyRole()
    {
+      Role aRole = new SimpleRole("aRole");
+      
       SimpleRoleGroup srg = new SimpleRoleGroup("Roles");
-      srg.addRole(new SimpleRole(SimpleRole.ANYBODY));
-      assertTrue(srg.containsRole(new SimpleRole("AnyRole")));
+      srg.addRole(SimpleRole.ANYBODY_ROLE);
+      assertTrue(srg.containsRole(aRole));
+      
+      //All simple roles contain ANYBODY_ROLE
+      assertTrue(aRole.containsAll(SimpleRole.ANYBODY_ROLE));
    }