X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Ftest%2FAssertionUtils.java;h=9c211b7ad5ea8ce4a9afd66556600f56f875ae52;hb=b07965c3b385ade1d06ac8b12ede1586014d2525;hp=c0387e0cf8b4e92d43b8a593c0e7a5eae304e3a0;hpb=17775e14ecfb286e59f67117e5cee7e21e95ab1f;p=utils

diff --git a/support/general/src/test/java/org/wamblee/test/AssertionUtils.java b/support/general/src/test/java/org/wamblee/test/AssertionUtils.java
index c0387e0c..9c211b7a 100644
--- a/support/general/src/test/java/org/wamblee/test/AssertionUtils.java
+++ b/support/general/src/test/java/org/wamblee/test/AssertionUtils.java
@@ -15,16 +15,16 @@
  */ 
 package org.wamblee.test;
 
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Set;
+import java.util.Map.Entry;
+
 import junit.framework.TestCase;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
 /**
  * Useful assertions for use in test cases.
  * 
@@ -112,14 +112,14 @@ public final class AssertionUtils {
         TestCase.assertEquals("Map sizes differ", aExpectedMap.size(), aActual
             .size());
 
-        Set keys = aExpectedMap.keySet();
+        Set<Entry<Key,Value>> expectedEntries = aExpectedMap.entrySet();
 
-        for (Iterator i = keys.iterator(); i.hasNext();) {
-            String key = (String) i.next();
+        for (Entry<Key,Value> entry: expectedEntries) {
+            Key key = entry.getKey();
             TestCase.assertTrue("Map does not containg entry for key:" + key,
                 aActual.containsKey(key));
             AssertionUtils.assertEquals("Value of key " + key + " of map",
-                aExpectedMap.get(key), aActual.get(key));
+                entry.getValue(), aActual.get(key));
         }
     }
 
@@ -141,9 +141,8 @@ public final class AssertionUtils {
                 LOG.info("Expected exception occured " + t.getMessage());
 
                 return; // ok
-            } else {
-                throw new RuntimeException(t);
-            }
+            } 
+            throw new RuntimeException(t);
         }
     }