svn commit: r619754 - /geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/realm/providers/GeronimoPropertiesFileMappedPasswordCredentialLoginModuleTest.java

[dw...@apache.org]

Author: dwoods
Date: Thu Feb  7 19:26:41 2008
New Revision: 619754

URL: http://svn.apache.org/viewvc?rev=619754&view=rev
Log:
GERONIMO-3830 Test assumes a specific Set ordering, which fails on Java 6.  Toby, thanks for the patch.

Modified:
    geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/realm/providers/GeronimoPropertiesFileMappedPasswordCredentialLoginModuleTest.java

Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/realm/providers/GeronimoPropertiesFileMappedPasswordCredentialLoginModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/realm/providers/GeronimoPropertiesFileMappedPasswordCredentialLoginModuleTest.java?rev=619754&r1=619753&r2=619754&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/realm/providers/GeronimoPropertiesFileMappedPasswordCredentialLoginModuleTest.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/realm/providers/GeronimoPropertiesFileMappedPasswordCredentialLoginModuleTest.java Thu Feb  7 19:26:41 2008
@@ -20,15 +20,16 @@
 
 package org.apache.geronimo.security.realm.providers;
 
-import java.util.Set;
-import java.util.HashSet;
+import java.util.Comparator;
 import java.util.Iterator;
+import java.util.Set;
+import java.util.TreeSet;
 
 import junit.framework.TestCase;
 import org.apache.geronimo.security.jaas.NamedUsernamePasswordCredential;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class GeronimoPropertiesFileMappedPasswordCredentialLoginModuleTest extends TestCase {
     private GeronimoPropertiesFileMappedPasswordCredentialLoginModule loginModule;
@@ -36,7 +37,11 @@
 
     protected void setUp() {
         loginModule = new GeronimoPropertiesFileMappedPasswordCredentialLoginModule();
-        passwordCredentials = new HashSet<NamedUsernamePasswordCredential>();
+        passwordCredentials = new TreeSet<NamedUsernamePasswordCredential>(new Comparator() {
+            public int compare(Object o1, Object o2) {
+                return ((NamedUsernamePasswordCredential)o1).getName().compareTo(((NamedUsernamePasswordCredential)o2).getName());
+            }
+        });
     }
 
     public void testParsingOne() throws Exception {