Author: bdaw Date: 2007-02-02 17:17:37 -0500 (Fri, 02 Feb 2007) New Revision: 6149 Modified: trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticRoleMembershipModuleTestCase.java Log: - minor correction in tests Modified: trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticRoleMembershipModuleTestCase.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticRoleMembershipModuleTestCase.java 2007-02-02 17:31:13 UTC (rev 6148) +++ trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticRoleMembershipModuleTestCase.java 2007-02-02 22:17:37 UTC (rev 6149) @@ -62,6 +62,8 @@ private String suffix; + private String prefix; + public void setUp() throws Exception { super.setUp(); @@ -98,10 +100,10 @@ values.add("memberOf"); configuration.setValues(IdentityConfiguration.GROUP_COMMON,IdentityConfiguration.MEMBERSHIP_ATTRIBUTE_ID, values); + prefix = ((IdentityConfiguration)identityContext.getObject(IdentityContext.TYPE_IDENTITY_CONFIGURATION)).getValue(IdentityConfiguration.USER_UID_ATTRIBUTE_ID); - populate(); } @@ -119,9 +121,9 @@ LDAPUserImpl user = (LDAPUserImpl)iterator.next(); names.add(user.getDn().toLowerCase()); } - assertTrue(names.contains(("uid=jduke,ou=People,o=example2," + suffix).toLowerCase())); - assertTrue(names.contains(("uid=jduke1,ou=People,o=example2," + suffix).toLowerCase())); - assertTrue(names.contains(("uid=jduke2,ou=People,o=example2," + suffix).toLowerCase())); + assertTrue(names.contains((prefix + "=jduke,ou=People,o=example2," + suffix).toLowerCase())); + assertTrue(names.contains((prefix + "=jduke1,ou=People,o=example2," + suffix).toLowerCase())); + assertTrue(names.contains((prefix + "=jduke2,ou=People,o=example2," + suffix).toLowerCase())); role = (LDAPRoleImpl)roleModule.findRoleByName("Echo1"); users = membershipModule.getUsers(role); @@ -134,8 +136,8 @@ LDAPUserImpl user = (LDAPUserImpl)iterator.next(); names.add(user.getDn().toLowerCase()); } - assertTrue(names.contains(("uid=jduke1,ou=People,o=example2," + suffix).toLowerCase())); - assertTrue(names.contains(("uid=jduke2,ou=People,o=example2," + suffix).toLowerCase())); + assertTrue(names.contains((prefix + "=jduke1,ou=People,o=example2," + suffix).toLowerCase())); + assertTrue(names.contains((prefix + "=jduke2,ou=People,o=example2," + suffix).toLowerCase())); role = (LDAPRoleImpl)roleModule.findRoleByName("TheDuke"); users = membershipModule.getUsers(role); @@ -148,7 +150,7 @@ LDAPUserImpl user = (LDAPUserImpl)iterator.next(); names.add(user.getDn().toLowerCase()); } - assertTrue(names.contains(("uid=jduke2,ou=People,o=example2," + suffix).toLowerCase())); + assertTrue(names.contains((prefix + "=jduke2,ou=People,o=example2," + suffix).toLowerCase())); role = (LDAPRoleImpl)roleModule.findRoleByName("EmptyRole"); users = membershipModule.getUsers(role); @@ -278,8 +280,8 @@ names.add(user.getDn().toLowerCase()); } - assertTrue(names.contains(("uid=jduke3,ou=People,o=example2," + suffix).toLowerCase())); - assertTrue(names.contains(("uid=jduke4,ou=People,o=example2," + suffix).toLowerCase())); + assertTrue(names.contains((prefix + "=jduke3,ou=People,o=example2," + suffix).toLowerCase())); + assertTrue(names.contains((prefix + "=jduke4,ou=People,o=example2," + suffix).toLowerCase())); membershipModule.assignUsers(role,new HashSet()); users = membershipModule.getUsers(role);