(no commit message)

[utils] / support / general / src / test / java / org / wamblee / test / AssertionUtils.java

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 c0387e0cf8b4e92d43b8a593c0e7a5eae304e3a0..b23eee933ecb6fbf3cc2878381a759e52c6797c8 100644 (file)
--- a/support/general/src/test/java/org/wamblee/test/AssertionUtils.java
+++ b/support/general/src/test/java/org/wamblee/test/AssertionUtils.java
@@ -15,15 +15,13 @@
  */ 
 package org.wamblee.test;
 
-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;
+import java.util.Map.Entry;
+import java.util.logging.Logger;
+
+import junit.framework.TestCase;
 
 /**
  * Useful assertions for use in test cases.
@@ -31,7 +29,7 @@ import java.util.Set;
  * @author Erik Brakkee
  */
 public final class AssertionUtils {
-    private static final Log LOG = LogFactory.getLog(AssertionUtils.class);
+    private static final Logger LOG = Logger.getLogger(AssertionUtils.class.getName());
 
     /**
      * Disabled constructor.
@@ -112,14 +110,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 +139,8 @@ public final class AssertionUtils {
                 LOG.info("Expected exception occured " + t.getMessage());
 
                 return; // ok
-            } else {
-                throw new RuntimeException(t);
-            }
+            } 
+            throw new RuntimeException(t);
         }
     }