/*
- * 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.
*/
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
/**
* Asserts that two object arrays are equal.
- *
+ *
* @param aExpected
* Expected object array.
* @param aActual
/**
* Asserts that two object arrays are equal.
- *
+ *
* @param aMsg
* Message.
* @param aExpected
}
}
- /**
+/**
* Asserts that two objects are equal, and in case the object is an Object[]
- * delegates to {@link #assertEquals(String, Object[], Object[]).
+ * delegates to {@link #assertEquals(String, Object[], Object[])}.
*
* @param aMsg
* Message.
/**
* 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
*/
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 aObject Erroneious code.
+ * 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 {
if (aType.isInstance(t)) {
LOG.info("Expected exception occured " + t.getMessage());
- return; // ok
- } else {
- throw new RuntimeException(t);
+ return; // ok
}
+ throw new RuntimeException(t);
}
}