[portal-commits] JBoss Portal SVN: r6094 - trunk/identity/src/main/org/jboss/portal/test/identity/ldap.

Author: bdaw Date: 2007-01-24 19:22:24 -0500 (Wed, 24 Jan 2007) New Revision: 6094 Modified: trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTestCase.java trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticRoleMembershipModuleTestCase.java Log: - correct ldap DNs assertions in testcases to be not case sensitive Modified: trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTestCase.java =================================================================== --- trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTestCase.java 2007-01-24 23:57:02 UTC (rev 6093) +++ trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTestCase.java 2007-01-25 00:22:24 UTC (rev 6094) @@ -93,11 +93,11 @@ for (Iterator iterator = users.iterator(); iterator.hasNext();) { LDAPUserImpl user = (LDAPUserImpl)iterator.next(); - names.add(user.getDn()); + names.add(user.getDn().toLowerCase()); } - assertTrue(names.contains("uid=jduke1,ou=People," + suffix)); - assertTrue(names.contains("uid=jduke3,ou=People," + suffix)); - assertTrue(names.contains("uid=jduke4,ou=People," + suffix)); + assertTrue(names.contains(("uid=jduke1,ou=People," + suffix).toLowerCase())); + assertTrue(names.contains(("uid=jduke3,ou=People," + suffix).toLowerCase())); + assertTrue(names.contains(("uid=jduke4,ou=People," + suffix).toLowerCase())); } //TODO:extend this @@ -112,9 +112,9 @@ for (Iterator iterator = roles.iterator(); iterator.hasNext();) { LDAPRoleImpl role = (LDAPRoleImpl)iterator.next(); - roleNames.add(role.getDn()); + roleNames.add(role.getDn().toLowerCase()); } - assertTrue(roleNames.contains("cn=Echo,ou=Roles," + suffix)); + assertTrue(roleNames.contains(("cn=Echo,ou=Roles," + suffix).toLowerCase())); user = (LDAPUserImpl)userModule.findUserByUserName("jduke3"); roles = membershipModule.getRoles(user); @@ -125,10 +125,10 @@ for (Iterator iterator = roles.iterator(); iterator.hasNext();) { LDAPRoleImpl role = (LDAPRoleImpl)iterator.next(); - roleNames.add(role.getDn()); + roleNames.add(role.getDn().toLowerCase()); } - assertTrue(roleNames.contains("cn=Echo,ou=Roles," + suffix)); - assertTrue(roleNames.contains("cn=Echo1,ou=Roles," + suffix)); + assertTrue(roleNames.contains(("cn=Echo,ou=Roles," + suffix).toLowerCase())); + assertTrue(roleNames.contains(("cn=Echo1,ou=Roles," + suffix).toLowerCase())); } @@ -151,11 +151,11 @@ for (Iterator iterator = users.iterator(); iterator.hasNext();) { LDAPUserImpl user = (LDAPUserImpl)iterator.next(); - names.add(user.getDn()); + names.add(user.getDn().toLowerCase()); } - assertTrue(names.contains("uid=jduke1,ou=People," + suffix)); - assertTrue(names.contains("uid=jduke4,ou=People," + suffix)); + assertTrue(names.contains(("uid=jduke1,ou=People," + suffix).toLowerCase())); + assertTrue(names.contains(("uid=jduke4,ou=People," + suffix).toLowerCase())); } @@ -177,11 +177,11 @@ for (Iterator iterator = users.iterator(); iterator.hasNext();) { LDAPUserImpl user = (LDAPUserImpl)iterator.next(); - names.add(user.getDn()); + names.add(user.getDn().toLowerCase()); } - assertTrue(names.contains("uid=jduke3,ou=People," + suffix)); - assertTrue(names.contains("uid=jduke4,ou=People," + suffix)); + assertTrue(names.contains(("uid=jduke3,ou=People," + suffix).toLowerCase())); + assertTrue(names.contains(("uid=jduke4,ou=People," + suffix).toLowerCase())); /*membershipModule.assignUsers(role,new HashSet()); users = membershipModule.getUsers(role); 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-01-24 23:57:02 UTC (rev 6093) +++ trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticRoleMembershipModuleTestCase.java 2007-01-25 00:22:24 UTC (rev 6094) @@ -117,11 +117,11 @@ for (Iterator iterator = users.iterator(); iterator.hasNext();) { LDAPUserImpl user = (LDAPUserImpl)iterator.next(); - names.add(user.getDn()); + names.add(user.getDn().toLowerCase()); } - assertTrue(names.contains("uid=jduke,ou=People,o=example2," + suffix)); - assertTrue(names.contains("uid=jduke1,ou=People,o=example2," + suffix)); - assertTrue(names.contains("uid=jduke2,ou=People,o=example2," + suffix)); + 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())); role = (LDAPRoleImpl)roleModule.findRoleByName("Echo1"); users = membershipModule.getUsers(role); @@ -132,10 +132,10 @@ for (Iterator iterator = users.iterator(); iterator.hasNext();) { LDAPUserImpl user = (LDAPUserImpl)iterator.next(); - names.add(user.getDn()); + names.add(user.getDn().toLowerCase()); } - assertTrue(names.contains("uid=jduke1,ou=People,o=example2," + suffix)); - assertTrue(names.contains("uid=jduke2,ou=People,o=example2," + suffix)); + assertTrue(names.contains(("uid=jduke1,ou=People,o=example2," + suffix).toLowerCase())); + assertTrue(names.contains(("uid=jduke2,ou=People,o=example2," + suffix).toLowerCase())); role = (LDAPRoleImpl)roleModule.findRoleByName("TheDuke"); users = membershipModule.getUsers(role); @@ -146,9 +146,9 @@ for (Iterator iterator = users.iterator(); iterator.hasNext();) { LDAPUserImpl user = (LDAPUserImpl)iterator.next(); - names.add(user.getDn()); + names.add(user.getDn().toLowerCase()); } - assertTrue(names.contains("uid=jduke2,ou=People,o=example2," + suffix)); + assertTrue(names.contains(("uid=jduke2,ou=People,o=example2," + suffix).toLowerCase())); role = (LDAPRoleImpl)roleModule.findRoleByName("EmptyRole"); users = membershipModule.getUsers(role); @@ -168,9 +168,9 @@ for (Iterator iterator = roles.iterator(); iterator.hasNext();) { LDAPRoleImpl role = (LDAPRoleImpl)iterator.next(); - roleNames.add(role.getDn()); + roleNames.add(role.getDn().toLowerCase()); } - assertTrue(roleNames.contains("cn=Echo,ou=Roles,o=example2," + suffix)); + assertTrue(roleNames.contains(("cn=Echo,ou=Roles,o=example2," + suffix).toLowerCase())); user = (LDAPUserImpl)userModule.findUserByUserName("jduke1"); roles = membershipModule.getRoles(user); @@ -181,10 +181,10 @@ for (Iterator iterator = roles.iterator(); iterator.hasNext();) { LDAPRoleImpl role = (LDAPRoleImpl)iterator.next(); - roleNames.add(role.getDn()); + roleNames.add(role.getDn().toLowerCase()); } - assertTrue(roleNames.contains("cn=Echo,ou=Roles,o=example2," + suffix)); - assertTrue(roleNames.contains("cn=Echo1,ou=Roles,o=example2," + suffix)); + assertTrue(roleNames.contains(("cn=Echo,ou=Roles,o=example2," + suffix).toLowerCase())); + assertTrue(roleNames.contains(("cn=Echo1,ou=Roles,o=example2," + suffix).toLowerCase())); user = (LDAPUserImpl)userModule.findUserByUserName("jduke2"); roles = membershipModule.getRoles(user); @@ -197,9 +197,9 @@ LDAPRoleImpl role = (LDAPRoleImpl)iterator.next(); roleNames.add(role.getDn()); } - assertTrue(roleNames.contains("cn=Echo,ou=Roles,o=example2," + suffix)); - assertTrue(roleNames.contains("cn=Echo1,ou=Roles,o=example2," + suffix)); - assertTrue(roleNames.contains("cn=TheDuke,ou=Roles,o=example2," + suffix)); + assertTrue(roleNames.contains(("cn=Echo,ou=Roles,o=example2," + suffix).toLowerCase())); + assertTrue(roleNames.contains(("cn=Echo1,ou=Roles,o=example2," + suffix).toLowerCase())); + assertTrue(roleNames.contains(("cn=TheDuke,ou=Roles,o=example2," + suffix).toLowerCase())); user = (LDAPUserImpl)userModule.findUserByUserName("jduke3"); roles = membershipModule.getRoles(user); @@ -228,11 +228,11 @@ for (Iterator iterator = roles.iterator(); iterator.hasNext();) { LDAPRoleImpl role = (LDAPRoleImpl)iterator.next(); - names.add(role.getDn()); + names.add(role.getDn().toLowerCase()); } - assertTrue(names.contains("cn=Echo,ou=Roles,o=example2," + suffix)); - assertTrue(names.contains("cn=TheDuke,ou=Roles,o=example2," + suffix)); + assertTrue(names.contains(("cn=Echo,ou=Roles,o=example2," + suffix).toLowerCase())); + assertTrue(names.contains(("cn=TheDuke,ou=Roles,o=example2," + suffix).toLowerCase())); roles = membershipModule.getRoles(user1); @@ -243,11 +243,11 @@ for (Iterator iterator = roles.iterator(); iterator.hasNext();) { LDAPRoleImpl role = (LDAPRoleImpl)iterator.next(); - names.add(role.getDn()); + names.add(role.getDn().toLowerCase()); } - assertTrue(names.contains("cn=Echo,ou=Roles,o=example2," + suffix)); - assertTrue(names.contains("cn=TheDuke,ou=Roles,o=example2," + suffix)); + assertTrue(names.contains(("cn=Echo,ou=Roles,o=example2," + suffix).toLowerCase())); + assertTrue(names.contains(("cn=TheDuke,ou=Roles,o=example2," + suffix).toLowerCase())); membershipModule.assignRoles(user1,new HashSet()); roles = membershipModule.getRoles(user1); @@ -275,11 +275,11 @@ for (Iterator iterator = users.iterator(); iterator.hasNext();) { LDAPUserImpl user = (LDAPUserImpl)iterator.next(); - names.add(user.getDn()); + names.add(user.getDn().toLowerCase()); } - assertTrue(names.contains("uid=jduke3,ou=People,o=example2," + suffix)); - assertTrue(names.contains("uid=jduke4,ou=People,o=example2," + suffix)); + assertTrue(names.contains(("uid=jduke3,ou=People,o=example2," + suffix).toLowerCase())); + assertTrue(names.contains(("uid=jduke4,ou=People,o=example2," + suffix).toLowerCase())); membershipModule.assignUsers(role,new HashSet()); users = membershipModule.getUsers(role);