X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Ftest%2FTestCase.java;h=b37ea987ffca27677a32eb5d31d05e2632974c52;hp=0349bc07c5cdcb3df3b6e90e92dd10d9febaba6f;hb=16d593780fa5a4c39cc36b29382da610eae951da;hpb=80383c142f85a7850d0fbea418689608fdccac05

diff --git a/src/be/nikiroo/utils/test/TestCase.java b/src/be/nikiroo/utils/test/TestCase.java
index 0349bc0..b37ea98 100644
--- a/src/be/nikiroo/utils/test/TestCase.java
+++ b/src/be/nikiroo/utils/test/TestCase.java
@@ -123,10 +123,7 @@ abstract public class TestCase {
 			throws AssertException {
 
 		if (errorMessage == null) {
-			errorMessage = String.format("" //
-					+ "Assertion failed!\n" //
-					+ "Expected value: [%s]\n" //
-					+ "Actual value: [%s]", expected, actual);
+			errorMessage = generateAssertMessage(expected, actual);
 		}
 
 		if ((expected == null && actual != null)
@@ -235,4 +232,45 @@ abstract public class TestCase {
 			throws AssertException {
 		assertEquals(errorMessage, new Double(expected), new Double(actual));
 	}
+
+	/**
+	 * Check that given {@link Object} is not NULL.
+	 * 
+	 * @param the
+	 *            error message to display if it is NULL
+	 * @param actual
+	 *            the actual value
+	 * 
+	 * @throws AssertException
+	 *             in case they differ
+	 */
+	public void assertNotNull(String errorMessage, Object actual)
+			throws AssertException {
+		if (actual == null) {
+			if (errorMessage == null) {
+				errorMessage = String.format("" //
+						+ "Assertion failed!\n" //
+						+ "Object should have been NULL: [%s]", actual);
+			}
+			throw new AssertException(errorMessage);
+		}
+	}
+
+	/**
+	 * Generate the default assert message for 2 different values that were
+	 * supposed to be equals.
+	 * 
+	 * @param expected
+	 *            the expected value
+	 * @param actual
+	 *            the actual value
+	 * 
+	 * @return the message
+	 */
+	public static String generateAssertMessage(Object expected, Object actual) {
+		return String.format("" //
+				+ "Assertion failed!\n" //
+				+ "Expected value: [%s]\n" //
+				+ "Actual value: [%s]", expected, actual);
+	}
 }