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

diff --git a/src/be/nikiroo/utils/test/TestCase.java b/src/be/nikiroo/utils/test/TestCase.java
index 0349bc0..a62cb0b 100644
--- a/src/be/nikiroo/utils/test/TestCase.java
+++ b/src/be/nikiroo/utils/test/TestCase.java
@@ -15,6 +15,10 @@ abstract public class TestCase {
 	class AssertException extends Exception {
 		private static final long serialVersionUID = 1L;
 
+		public AssertException(String reason, Exception source) {
+			super(reason, source);
+		}
+
 		public AssertException(String reason) {
 			super(reason);
 		}
@@ -38,6 +42,7 @@ abstract public class TestCase {
 	 * @throws Exception
 	 *             in case of error
 	 */
+	@SuppressWarnings("unused")
 	public void setUp() throws Exception {
 	}
 
@@ -47,6 +52,7 @@ abstract public class TestCase {
 	 * @throws Exception
 	 *             in case of error
 	 */
+	@SuppressWarnings("unused")
 	public void tearDown() throws Exception {
 	}
 
@@ -109,8 +115,8 @@ abstract public class TestCase {
 	/**
 	 * Check that 2 {@link Object}s are equals.
 	 * 
-	 * @param the
-	 *            error message to display if they differ
+	 * @param errorMessage
+	 *            the error message to display if they differ
 	 * @param expected
 	 *            the expected value
 	 * @param actual
@@ -121,17 +127,15 @@ abstract public class TestCase {
 	 */
 	public void assertEquals(String errorMessage, Object expected, Object actual)
 			throws AssertException {
-
-		if (errorMessage == null) {
-			errorMessage = String.format("" //
-					+ "Assertion failed!\n" //
-					+ "Expected value: [%s]\n" //
-					+ "Actual value: [%s]", expected, actual);
-		}
-
 		if ((expected == null && actual != null)
 				|| (expected != null && !expected.equals(actual))) {
-			throw new AssertException(errorMessage);
+			if (errorMessage == null) {
+				throw new AssertException(generateAssertMessage(expected,
+						actual));
+			}
+
+			throw new AssertException(errorMessage, new AssertException(
+					generateAssertMessage(expected, actual)));
 		}
 	}
 
@@ -147,14 +151,14 @@ abstract public class TestCase {
 	 *             in case they differ
 	 */
 	public void assertEquals(long expected, long actual) throws AssertException {
-		assertEquals(new Long(expected), new Long(actual));
+		assertEquals(Long.valueOf(expected), Long.valueOf(actual));
 	}
 
 	/**
 	 * Check that 2 {@link Object}s are equals.
 	 * 
-	 * @param the
-	 *            error message to display if they differ
+	 * @param errorMessage
+	 *            the error message to display if they differ
 	 * @param expected
 	 *            the expected value
 	 * @param actual
@@ -165,7 +169,7 @@ abstract public class TestCase {
 	 */
 	public void assertEquals(String errorMessage, long expected, long actual)
 			throws AssertException {
-		assertEquals(errorMessage, new Long(expected), new Long(actual));
+		assertEquals(errorMessage, Long.valueOf(expected), Long.valueOf(actual));
 	}
 
 	/**
@@ -181,14 +185,14 @@ abstract public class TestCase {
 	 */
 	public void assertEquals(boolean expected, boolean actual)
 			throws AssertException {
-		assertEquals(new Boolean(expected), new Boolean(actual));
+		assertEquals(Boolean.valueOf(expected), Boolean.valueOf(actual));
 	}
 
 	/**
 	 * Check that 2 {@link Object}s are equals.
 	 * 
-	 * @param the
-	 *            error message to display if they differ
+	 * @param errorMessage
+	 *            the error message to display if they differ
 	 * @param expected
 	 *            the expected value
 	 * @param actual
@@ -199,7 +203,8 @@ abstract public class TestCase {
 	 */
 	public void assertEquals(String errorMessage, boolean expected,
 			boolean actual) throws AssertException {
-		assertEquals(errorMessage, new Boolean(expected), new Boolean(actual));
+		assertEquals(errorMessage, Boolean.valueOf(expected),
+				Boolean.valueOf(actual));
 	}
 
 	/**
@@ -215,14 +220,14 @@ abstract public class TestCase {
 	 */
 	public void assertEquals(double expected, double actual)
 			throws AssertException {
-		assertEquals(new Double(expected), new Double(actual));
+		assertEquals(Double.valueOf(expected), Double.valueOf(actual));
 	}
 
 	/**
 	 * Check that 2 {@link Object}s are equals.
 	 * 
-	 * @param the
-	 *            error message to display if they differ
+	 * @param errorMessage
+	 *            the error message to display if they differ
 	 * @param expected
 	 *            the expected value
 	 * @param actual
@@ -233,6 +238,52 @@ abstract public class TestCase {
 	 */
 	public void assertEquals(String errorMessage, double expected, double actual)
 			throws AssertException {
-		assertEquals(errorMessage, new Double(expected), new Double(actual));
+		assertEquals(errorMessage, Double.valueOf(expected),
+				Double.valueOf(actual));
+	}
+
+	/**
+	 * Check that given {@link Object} is not NULL.
+	 * 
+	 * @param errorMessage
+	 *            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) {
+			String defaultReason = String.format("" //
+					+ "Assertion failed!%n" //
+					+ "Object should not have been NULL");
+
+			if (errorMessage == null) {
+				throw new AssertException(defaultReason);
+			}
+
+			throw new AssertException(errorMessage, new AssertException(
+					defaultReason));
+		}
+	}
+
+	/**
+	 * 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);
 	}
 }