X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Ftest%2FAssertionUtils.java;h=e6e0b155c72650cc06b3d42bc913d44f66ee77fa;hb=HEAD;hp=9c211b7ad5ea8ce4a9afd66556600f56f875ae52;hpb=dfc547c60bdd4cdaf9da202e0af4494c782437e7;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 9c211b7a..e6e0b155 100644 --- a/support/general/src/test/java/org/wamblee/test/AssertionUtils.java +++ b/support/general/src/test/java/org/wamblee/test/AssertionUtils.java @@ -12,26 +12,25 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - */ + */ package org.wamblee.test; import java.util.Arrays; import java.util.Map; import java.util.Set; import java.util.Map.Entry; +import java.util.logging.Logger; import junit.framework.TestCase; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - /** * 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. @@ -76,7 +75,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[]). + * delegates to {@link #assertEquals(String, Object[], Object[])}. * * @param aMsg * Message. @@ -112,9 +111,9 @@ public final class AssertionUtils { TestCase.assertEquals("Map sizes differ", aExpectedMap.size(), aActual .size()); - Set> expectedEntries = aExpectedMap.entrySet(); + Set> expectedEntries = aExpectedMap.entrySet(); - for (Entry entry: expectedEntries) { + for (Entry entry : expectedEntries) { Key key = entry.getKey(); TestCase.assertTrue("Map does not containg entry for key:" + key, aActual.containsKey(key)); @@ -126,7 +125,7 @@ public final class AssertionUtils { /** * Asserts that an exception occurs. * - * @param aRunnable + * @param aObject Erroneious code. * Test cases should create a subclass of this which contains the * code that should throw an exception. * @param aType @@ -141,7 +140,7 @@ public final class AssertionUtils { LOG.info("Expected exception occured " + t.getMessage()); return; // ok - } + } throw new RuntimeException(t); } }