[jboss-cvs] JBossAS SVN: r68276 - projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear.

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

Author: scott.stark at jboss.org
Date: 2007-12-14 04:00:04 -0500 (Fri, 14 Dec 2007)
New Revision: 68276

Modified:
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java
Log:
Make the check of principal order independent

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java	2007-12-14 08:46:16 UTC (rev 68275)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java	2007-12-14 09:00:04 UTC (rev 68276)
@@ -208,26 +208,27 @@
       assertNotNull(Employee);
       assertEquals("Employee", Employee.getRoleName());
       assertEquals(2, Employee.getPrincipals().size());
-      String[] principals = {};
-      principals = Employee.getPrincipals().toArray(principals);
-      assertEquals("javajoe", principals[0]);
-      assertEquals("j2ee", principals[1]);
+      Set<String> principals = Employee.getPrincipals();
+      HashSet<String> expected = new HashSet<String>();
+      expected.add("javajoe");
+      expected.add("j2ee");
+      assertEquals(expected, principals);
       // Manager
       SecurityRoleMetaData Manager = secRoles.get("Manager");
       assertNotNull(Manager);
       assertEquals("Manager", Manager.getRoleName());
       assertEquals(1, Manager.getPrincipals().size());
-      principals = new String[0];
-      principals = Manager.getPrincipals().toArray(principals);
-      assertEquals("javajoe", principals[0]);
+      String[] principalsArray = new String[0];
+      principalsArray = Manager.getPrincipals().toArray(principalsArray);
+      assertEquals("javajoe", principalsArray[0]);
       // Administrator
       SecurityRoleMetaData Administrator = secRoles.get("Administrator");
       assertNotNull(Administrator);
       assertEquals("Administrator", Administrator.getRoleName());
       assertEquals(1, Administrator.getPrincipals().size());
-      principals = new String[0];
-      principals = Administrator.getPrincipals().toArray(principals);
-      assertEquals("j2ee", principals[0]);
+      principalsArray = new String[0];
+      principalsArray = Administrator.getPrincipals().toArray(principalsArray);
+      assertEquals("j2ee", principalsArray[0]);
 
       Set<String> j2eeRoles = secRoles.getSecurityRoleNamesByPrincipal("j2ee");
       HashSet<String> expectedj2eeRoles = new HashSet<String>();
@@ -245,11 +246,9 @@
       Employee = j2eeRolesMD.get("Employee");
       assertNotNull(Employee);
       assertEquals("Employee", Employee.getRoleName());
-      assertEquals(2, Employee.getPrincipals().size());
-      principals = new String[0];
-      principals = Employee.getPrincipals().toArray(principals);
-      assertEquals("javajoe", principals[0]);
-      assertEquals("j2ee", principals[1]);
+      principals = Employee.getPrincipals();
+      assertEquals(2, principals.size());
+      assertEquals(expected, principals);
    }
 
    /**