Return-Path: 
 <commits-return-17291-apmail-commons-commits-archive=commons.apache.org@commons.apache.org>
Delivered-To: apmail-commons-commits-archive@minotaur.apache.org
Received: (qmail 80178 invoked from network); 4 Apr 2011 02:22:12 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 4 Apr 2011 02:22:12 -0000
Received: (qmail 40697 invoked by uid 500); 4 Apr 2011 02:22:12 -0000
Delivered-To: apmail-commons-commits-archive@commons.apache.org
Received: (qmail 40643 invoked by uid 500); 4 Apr 2011 02:22:12 -0000
Mailing-List: contact commits-help@commons.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@commons.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@commons.apache.org>
List-Post: <mailto:commits@commons.apache.org>
List-Id: <commits.commons.apache.org>
Reply-To: dev@commons.apache.org
Delivered-To: mailing list commits@commons.apache.org
Received: (qmail 40636 invoked by uid 99); 4 Apr 2011 02:22:12 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Apr 2011 02:22:12 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Apr 2011 02:22:09 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 81E7A23889E3; Mon,  4 Apr 2011 02:21:48 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1088463 - in
 /commons/proper/codec/trunk/src/test/org/apache/commons/codec:
 StringEncoderComparatorTest.java binary/HexTest.java
Date: Mon, 04 Apr 2011 02:21:48 -0000
To: commits@commons.apache.org
From: ggregory@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110404022148.81E7A23889E3@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ggregory
Date: Mon Apr  4 02:21:48 2011
New Revision: 1088463

URL: http://svn.apache.org/viewvc?rev=1088463&view=rev
Log:
Use Generics and Java 5 for loop.

Modified:
    commons/proper/codec/trunk/src/test/org/apache/commons/codec/StringEncoderComparatorTest.java
    commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/HexTest.java

Modified: commons/proper/codec/trunk/src/test/org/apache/commons/codec/StringEncoderComparatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/org/apache/commons/codec/StringEncoderComparatorTest.java?rev=1088463&r1=1088462&r2=1088463&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/test/org/apache/commons/codec/StringEncoderComparatorTest.java (original)
+++ commons/proper/codec/trunk/src/test/org/apache/commons/codec/StringEncoderComparatorTest.java Mon Apr  4 02:21:48 2011
@@ -53,20 +53,19 @@ public class StringEncoderComparatorTest
     
     @Test
     public void testComparatorWithDoubleMetaphone() throws Exception {
-        StringEncoderComparator sCompare =
-            new StringEncoderComparator( new DoubleMetaphone() );
-            
+        StringEncoderComparator sCompare = new StringEncoderComparator(new DoubleMetaphone());
+
         String[] testArray = { "Jordan", "Sosa", "Prior", "Pryor" };
-        List testList = Arrays.asList( testArray );        
-        
+        List<String> testList = Arrays.asList(testArray);
+
         String[] controlArray = { "Jordan", "Prior", "Pryor", "Sosa" };
 
-        Collections.sort( testList, sCompare);            
-        
+        Collections.sort(testList, sCompare);
+
         String[] resultArray = (String[]) testList.toArray(new String[0]);
-        
-        for( int i = 0; i < resultArray.length; i++) {
-            assertEquals( "Result Array not Equal to Control Array at index: " + i, controlArray[i], resultArray[i] );
+
+        for (int i = 0; i < resultArray.length; i++) {
+            assertEquals("Result Array not Equal to Control Array at index: " + i, controlArray[i], resultArray[i]);
         }
     }
 

Modified: commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/HexTest.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/HexTest.java?rev=1088463&r1=1088462&r2=1088463&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/HexTest.java (original)
+++ commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/HexTest.java Mon Apr  4 02:21:48 2011
@@ -25,10 +25,7 @@ import static org.junit.Assert.fail;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.Random;
-import java.util.Set;
-import java.util.SortedMap;
 
 import junit.framework.Assert;
 
@@ -126,13 +123,8 @@ public class HexTest {
 
     @Test
     public void testCustomCharset() throws UnsupportedEncodingException, DecoderException {
-        SortedMap map = Charset.availableCharsets();
-        Set keys = map.keySet();
-        Iterator iterator = keys.iterator();
-        log("testCustomCharset: Checking " + keys.size() + " charsets...");
-        while (iterator.hasNext()) {
-            String name = (String) iterator.next();
-            testCustomCharset(name, "testCustomCharset");
+        for (String name : Charset.availableCharsets().keySet()) {
+            testCustomCharset(name, "testCustomCharset");            
         }
     }