[jboss-cvs] JBossAS SVN: r69634 - projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/security/mapping.

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

Author: anil.saldhana at jboss.com
Date: 2008-02-05 17:36:15 -0500 (Tue, 05 Feb 2008)
New Revision: 69634

Modified:
   projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/security/mapping/DeploymentRolesMappingUnitTestCase.java
Log:
SECURITY-119: use rolegroup

Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/security/mapping/DeploymentRolesMappingUnitTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/security/mapping/DeploymentRolesMappingUnitTestCase.java	2008-02-05 22:34:47 UTC (rev 69633)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/security/mapping/DeploymentRolesMappingUnitTestCase.java	2008-02-05 22:36:15 UTC (rev 69634)
@@ -21,7 +21,6 @@
   */
 package org.jboss.test.security.mapping;
 
-import java.security.acl.Group;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -30,14 +29,16 @@
 
 import javax.security.auth.Subject;
 
+import junit.framework.TestCase;
+
 import org.jboss.security.SecurityConstants;
-import org.jboss.security.SimpleGroup;
 import org.jboss.security.SimplePrincipal;
+import org.jboss.security.identity.RoleGroup;
+import org.jboss.security.identity.plugins.SimpleRole;
+import org.jboss.security.identity.plugins.SimpleRoleGroup;
 import org.jboss.security.mapping.MappingResult;
 import org.jboss.security.mapping.providers.DeploymentRolesMappingProvider;
 
-import junit.framework.TestCase;
-
 //$Id$
 
 /**
@@ -55,7 +56,7 @@
       cmap.put(SecurityConstants.PRINCIPAL_IDENTIFIER, new SimplePrincipal("anil"));
       cmap.put(SecurityConstants.DEPLOYMENT_PRINCIPAL_ROLES_MAP, getPrincipalRoleMap());
       
-      assertTrue(getMapping(cmap));
+      assertTrue(containsMapping(cmap));
    }
    
    public void testMappingWithPrincipalSet()
@@ -67,7 +68,7 @@
       cmap.put(SecurityConstants.PRINCIPALS_SET_IDENTIFIER, subject.getPrincipals());
       cmap.put(SecurityConstants.DEPLOYMENT_PRINCIPAL_ROLES_MAP, getPrincipalRoleMap());
        
-      assertTrue(getMapping(cmap));
+      assertTrue(containsMapping(cmap));
    }
    
    public void testUnsuccessfulMappingWithPrincipal()
@@ -76,7 +77,7 @@
       cmap.put(SecurityConstants.PRINCIPAL_IDENTIFIER, new SimplePrincipal("impostor"));
       cmap.put(SecurityConstants.DEPLOYMENT_PRINCIPAL_ROLES_MAP, getPrincipalRoleMap());
       
-      assertFalse(getMapping(cmap));
+      assertFalse(containsMapping(cmap));
    }
    
    public void testUnsuccessfulMappingWithPrincipalSet()
@@ -88,17 +89,19 @@
       cmap.put(SecurityConstants.PRINCIPALS_SET_IDENTIFIER, subject.getPrincipals());
       cmap.put(SecurityConstants.DEPLOYMENT_PRINCIPAL_ROLES_MAP, getPrincipalRoleMap());
        
-      assertFalse(getMapping(cmap));
+      assertFalse(containsMapping(cmap));
    }
    
-   private boolean getMapping(Map<String,Object> cmap)
+   private boolean containsMapping(Map<String,Object> cmap)
    {
       DeploymentRolesMappingProvider drmp = new DeploymentRolesMappingProvider();
-      MappingResult<Group> result = new MappingResult<Group>();
+      MappingResult<RoleGroup> result = new MappingResult<RoleGroup>();
+      //MappingResult<Group> result = new MappingResult<Group>();
       drmp.setMappingResult(result);
       
       drmp.performMapping(cmap, getGroup(new String[]{"gooduser","okuser"}));
-      return result.getMappedObject().isMember(new SimplePrincipal("allowedUser")); 
+      return result.getMappedObject().containsRole(new SimpleRole("allowedUser"));
+      //return result.getMappedObject().isMember(new SimplePrincipal("allowedUser")); 
    }
    
    private Map<String,Set<String>> getPrincipalRoleMap()
@@ -112,14 +115,14 @@
       return pmap;
    }
    
-   private Group getGroup(String[] principalArr)
+   private RoleGroup getGroup(String[] principalArr)
    {
-      SimpleGroup sg = new SimpleGroup(SecurityConstants.ROLES_IDENTIFIER);
+      RoleGroup rg = new SimpleRoleGroup(SecurityConstants.ROLES_IDENTIFIER);
       for(String p: principalArr)
       {
-         sg.addMember(new SimplePrincipal(p));
-      }
-      return sg;
+         rg.addRole(new SimpleRole(p));
+      } 
+      return rg;
    }
 
 }
\ No newline at end of file