X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Ftest%2FAssertionUtils.java;h=bd55115b66a9778b6e5b0d6262f53bf6a733a9c0;hb=4a575582a5c2999bd816b197d9cf274b4b3ddcd7;hp=966a52e4f4318a9f00d7ad9977f131e5f6c5a84c;hpb=ddd261f331280640c5b53c7128230b629ebcd268;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 966a52e4..bd55115b 100644
--- a/support/general/src/test/java/org/wamblee/test/AssertionUtils.java
+++ b/support/general/src/test/java/org/wamblee/test/AssertionUtils.java
@@ -1,12 +1,12 @@
 /*
- * Copyright 2006 the original author or authors.
- *
+ * Copyright 2005-2010 the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,28 +15,26 @@
  */
 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.
- *
+ * 
  * @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.
-     *
+     * 
      */
     private AssertionUtils() {
         // Empty
@@ -44,7 +42,7 @@ public final class AssertionUtils {
 
     /**
      * Asserts that two object arrays are equal.
-     *
+     * 
      * @param aExpected
      *            Expected object array.
      * @param aActual
@@ -56,7 +54,7 @@ public final class AssertionUtils {
 
     /**
      * Asserts that two object arrays are equal.
-     *
+     * 
      * @param aMsg
      *            Message.
      * @param aExpected
@@ -75,7 +73,7 @@ public final class AssertionUtils {
         }
     }
 
-    /**
+/**
      * Asserts that two objects are equal, and in case the object is an Object[]
      * delegates to {@link #assertEquals(String, Object[], Object[]).
      *
@@ -100,7 +98,7 @@ public final class AssertionUtils {
     /**
      * Asserts that two maps are equal by comparing all keys and by checking
      * that the values for the same keys are the same.
-     *
+     * 
      * @param aMsg
      *            Message.
      * @param aExpectedMap
@@ -110,25 +108,28 @@ public final class AssertionUtils {
      */
     public static <Key, Value> void assertEquals(String aMsg,
         Map<Key, Value> aExpectedMap, Map<Key, Value> aActual) {
-        TestCase.assertEquals("Map sizes differ", aExpectedMap.size(),
-            aActual.size());
+        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));
         }
     }
 
     /**
      * Asserts that an exception occurs.
-     * @param aRunnable Test cases should create a subclass of this which contains the
-     * code that should throw an exception.
-     * @param aType Type of exception that is expected.
+     * 
+     * @param aRunnable
+     *            Test cases should create a subclass of this which contains the
+     *            code that should throw an exception.
+     * @param aType
+     *            Type of exception that is expected.
      */
     public static void assertException(ErroneousCode aObject, Class aType) {
         try {
@@ -138,10 +139,9 @@ public final class AssertionUtils {
             if (aType.isInstance(t)) {
                 LOG.info("Expected exception occured " + t.getMessage());
 
-                return; // ok 
-            } else {
-                throw new RuntimeException(t);
+                return; // ok
             }
+            throw new RuntimeException(t);
         }
     }