Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 7089 invoked from network); 8 Feb 2008 03:57:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 Feb 2008 03:57:19 -0000 Received: (qmail 99120 invoked by uid 500); 8 Feb 2008 03:57:11 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 99112 invoked by uid 500); 8 Feb 2008 03:57:11 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 99101 invoked by uid 99); 8 Feb 2008 03:57:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Feb 2008 19:57:11 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Feb 2008 03:57:03 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2190A1A9832; Thu, 7 Feb 2008 19:56:56 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r619757 - /geronimo/server/branches/2.1/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/realm/providers/GeronimoPropertiesFileMappedPasswordCredentialLoginModuleTest.java Date: Fri, 08 Feb 2008 03:56:55 -0000 To: scm@geronimo.apache.org From: dwoods@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080208035656.2190A1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dwoods Date: Thu Feb 7 19:56:55 2008 New Revision: 619757 URL: http://svn.apache.org/viewvc?rev=619757&view=rev Log: GERONIMO-3830 Test assumes a specific Set ordering, which fails on Java 6. Verified the test still passes on Sun 1.5.0_14. Toby, thanks for the patch. Modified: geronimo/server/branches/2.1/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/realm/providers/GeronimoPropertiesFileMappedPasswordCredentialLoginModuleTest.java Modified: geronimo/server/branches/2.1/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/realm/providers/GeronimoPropertiesFileMappedPasswordCredentialLoginModuleTest.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/realm/providers/GeronimoPropertiesFileMappedPasswordCredentialLoginModuleTest.java?rev=619757&r1=619756&r2=619757&view=diff ============================================================================== --- geronimo/server/branches/2.1/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/realm/providers/GeronimoPropertiesFileMappedPasswordCredentialLoginModuleTest.java (original) +++ geronimo/server/branches/2.1/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/realm/providers/GeronimoPropertiesFileMappedPasswordCredentialLoginModuleTest.java Thu Feb 7 19:56:55 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(); + passwordCredentials = new TreeSet(new Comparator() { + public int compare(Object o1, Object o2) { + return ((NamedUsernamePasswordCredential)o1).getName().compareTo(((NamedUsernamePasswordCredential)o2).getName()); + } + }); } public void testParsingOne() throws Exception {