*/
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.
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));
}
}
LOG.info("Expected exception occured " + t.getMessage());
return; // ok
- } else {
- throw new RuntimeException(t);
- }
+ }
+ throw new RuntimeException(t);
}
}