Author: bdaw Date: 2007-08-20 10:32:54 -0400 (Mon, 20 Aug 2007) New Revision: 8001 Modified: branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/IdentityTest.java Log: fix identity test cases Modified: branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/IdentityTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/IdentityTest.java 2007-08-19 23:06:08 UTC (rev 8000) +++ branches/JBoss_Portal_Branch_2_6/identity/src/main/org/jboss/portal/test/identity/IdentityTest.java 2007-08-20 14:32:54 UTC (rev 8001) @@ -75,30 +75,45 @@ { ctx.begin(); Set set1 = userModule.findUsersFilteredByUserName("user", 0, 10); - Iterator it = set1.iterator(); - User user = (User)it.next(); - assertEquals("user1", user.getUserName()); - user = (User)it.next(); - assertEquals("user2", user.getUserName()); - + + + Set userNames = new HashSet(); + + for (Iterator iterator = set1.iterator(); iterator.hasNext();) + { + User u = (User)iterator.next(); + userNames.add(u.getUserName()); + } + + assertTrue(userNames.contains("user1")); + assertTrue(userNames.contains("user2")); + + // Set set2 = userModule.findUsersFilteredByUserName("blah", 0, 10); assertEquals(0, set2.size()); // Set set3 = userModule.findUsersFilteredByUserName("", 0, 10); - it = set3.iterator(); - user = (User)it.next(); - assertEquals("admin", user.getUserName()); - user = (User)it.next(); - assertEquals("user1", user.getUserName()); - user = (User)it.next(); - assertEquals("user2", user.getUserName()); + userNames = new HashSet(); + + for (Iterator iterator = set3.iterator(); iterator.hasNext();) + { + User u = (User)iterator.next(); + userNames.add(u.getUserName()); + } + + assertTrue(userNames.contains("admin")); + assertTrue(userNames.contains("user1")); + assertTrue(userNames.contains("user2")); + // Set set4 = userModule.findUsersFilteredByUserName("user1", 0, 10); - it = set4.iterator(); - user = (User)it.next(); + + + Iterator it = set4.iterator(); + User user = (User)it.next(); assertEquals("user1", user.getUserName()); ctx.commit(); } @@ -339,30 +354,44 @@ { ctx.begin(); Set set1 = membershipModule.findRoleMembers("role1", 0, 10, "user"); - Iterator i = set1.iterator(); - User user = (User)i.next(); - assertEquals("user1", user.getUserName()); - user = (User)i.next(); - assertEquals("user2", user.getUserName()); + Set userNames = new HashSet(); + + for (Iterator iterator = set1.iterator(); iterator.hasNext();) + { + User u = (User)iterator.next(); + userNames.add(u.getUserName()); + } + + assertTrue(userNames.contains("user1")); + assertTrue(userNames.contains("user2")); + + + // Set set2 = membershipModule.findRoleMembers("role1", 0, 10, "blah"); assertEquals(0, set2.size()); // Set set3 = membershipModule.findRoleMembers("role1", 0, 10, ""); - i = set3.iterator(); - user = (User)i.next(); - assertEquals("admin", user.getUserName()); - user = (User)i.next(); - assertEquals("user1", user.getUserName()); - user = (User)i.next(); - assertEquals("user2", user.getUserName()); + userNames = new HashSet(); + + for (Iterator iterator = set3.iterator(); iterator.hasNext();) + { + User u = (User)iterator.next(); + userNames.add(u.getUserName()); + } + + assertTrue(userNames.contains("user1")); + assertTrue(userNames.contains("user2")); + assertTrue(userNames.contains("admin")); + + // Set set4 = membershipModule.findRoleMembers("role1", 0, 10, "user1"); - i = set4.iterator(); - user = (User)i.next(); + Iterator i = set4.iterator(); + User user = (User)i.next(); assertEquals("user1", user.getUserName()); ctx.commit();