Use Generics and Java 5 for loop.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/codec/trunk@1088463 13f79535-47bb-0310-9956-ffa450edef68

Author: garydgregory

src/test/org/apache/commons/codec/StringEncoderComparatorTest.java

@@ -53,20 +53,19 @@ public void testComparatorWithSoundex() throws Exception {
 
     @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]);
         }
     }
 

src/test/org/apache/commons/codec/binary/HexTest.java

@@ -25,10 +25,7 @@
 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 @@ private void log(Throwable t) {
 
     @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");            
         }
     }