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

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

Author: anil.saldhana at jboss.com
Date: 2008-02-05 17:37:48 -0500 (Tue, 05 Feb 2008)
New Revision: 69636

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

Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/securitycontext/MappingContextTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/securitycontext/MappingContextTestCase.java	2008-02-05 22:37:00 UTC (rev 69635)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/securitycontext/MappingContextTestCase.java	2008-02-05 22:37:48 UTC (rev 69636)
@@ -21,15 +21,15 @@
   */
 package org.jboss.test.securitycontext; 
 
-import java.security.acl.Group;
 import java.util.HashMap;
 import java.util.HashSet;
 
 import org.jboss.security.SecurityConstants;
 import org.jboss.security.SecurityContext;
-import org.jboss.security.SimpleGroup;
-import org.jboss.security.SimplePrincipal;
 import org.jboss.security.config.SecurityConfiguration;
+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.MappingContext;
 
 //$Id$
@@ -57,15 +57,16 @@
       map.put(SecurityConstants.PRINCIPAL_IDENTIFIER, principal);
       map.put(SecurityConstants.DEPLOYMENT_PRINCIPAL_ROLES_MAP, rolesMap);
       
-      Group grp = new SimpleGroup(SecurityConstants.ROLES_IDENTIFIER);
-      grp.addMember(new SimplePrincipal("oldRole"));
-      MappingContext<Group> mc = sc.getMappingManager().getMappingContext(Group.class);
+      RoleGroup grp = new SimpleRoleGroup(SecurityConstants.ROLES_IDENTIFIER);
+      grp.addRole(new SimpleRole("oldRole"));
+      //grp.addMember(new SimplePrincipal("oldRole"));
+      MappingContext<RoleGroup> mc = sc.getMappingManager().getMappingContext(RoleGroup.class);
       mc.performMapping(map, grp);
       
-      grp = (Group) mc.getMappingResult().getMappedObject();
+      grp = (RoleGroup) mc.getMappingResult().getMappedObject();
       
-      assertFalse("oldRole does not exist", grp.isMember(new SimplePrincipal("oldRole")));
-      assertTrue("t1 exists?",grp.isMember(new SimplePrincipal("t1")));
-      assertTrue("t2 exists?",grp.isMember(new SimplePrincipal("t2")));
+      assertFalse("oldRole does not exist", grp.containsRole(new SimpleRole("oldRole")));
+      assertTrue("t1 exists?",grp.containsRole(new SimpleRole("t1")));
+      assertTrue("t2 exists?",grp.containsRole(new SimpleRole("t2")));
    }
 }
\ No newline at end of file

Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/securitycontext/SecurityContextTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/securitycontext/SecurityContextTestCase.java	2008-02-05 22:37:00 UTC (rev 69635)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/securitycontext/SecurityContextTestCase.java	2008-02-05 22:37:48 UTC (rev 69636)
@@ -21,7 +21,6 @@
   */
 package org.jboss.test.securitycontext;
 
-import java.security.acl.Group;
 import java.util.List;
 
 import javax.security.auth.Subject;
@@ -33,6 +32,7 @@
 import org.jboss.security.SecurityContextFactory;
 import org.jboss.security.audit.AuditManager;
 import org.jboss.security.config.SecurityConfiguration;
+import org.jboss.security.identity.RoleGroup;
 import org.jboss.security.identitytrust.IdentityTrustManager;
 import org.jboss.security.mapping.MappingContext;
 import org.jboss.security.mapping.providers.DeploymentRolesMappingProvider;
@@ -77,7 +77,7 @@
       JBossSecurityContext sc = getSC(securityDomain);
       ISecurityManagement ism = sc.getSecurityManagement();
       assertNotNull("Security Management is not null", ism);
-      MappingContext<Group> mc = sc.getMappingManager().getMappingContext(Group.class);
+      MappingContext<RoleGroup> mc = sc.getMappingManager().getMappingContext(RoleGroup.class);
       assertNotNull("Mapping Context is not null", mc); 
       List<?> modules = mc.getModules();
       assertNotNull("Mapping modules not null", modules);