Add more warnings source to 1.6) and fix warnings

[nikiroo-utils.git] / src / be / nikiroo / utils / test / TestCase.java

diff --git a/src/be/nikiroo/utils/test/TestCase.java b/src/be/nikiroo/utils/test/TestCase.java
index b37ea987ffca27677a32eb5d31d05e2632974c52..490edbb4ec9d47db7f2c24cf21630ac303dc7044 100644 (file)
--- 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);
                }
@@ -109,8 +113,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,14 +125,15 @@ abstract public class TestCase {
         */
        public void assertEquals(String errorMessage, Object expected, Object actual)
                        throws AssertException {
-
-               if (errorMessage == null) {
-                       errorMessage = generateAssertMessage(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)));
                }
        }
 
@@ -150,8 +155,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
@@ -184,8 +189,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
@@ -218,8 +223,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
@@ -236,8 +241,8 @@ abstract public class TestCase {
        /**
         * Check that given {@link Object} is not NULL.
         * 
-        * @param the
-        *            error message to display if it is NULL
+        * @param errorMessage
+        *            the error message to display if it is NULL
         * @param actual
         *            the actual value
         * 
@@ -247,12 +252,16 @@ abstract public class TestCase {
        public void assertNotNull(String errorMessage, Object actual)
                        throws AssertException {
                if (actual == null) {
+                       String defaultReason = String.format("" //
+                                       + "Assertion failed!\n" //
+                                       + "Object should have been NULL: [%s]", actual);
+
                        if (errorMessage == null) {
-                               errorMessage = String.format("" //
-                                               + "Assertion failed!\n" //
-                                               + "Object should have been NULL: [%s]", actual);
+                               throw new AssertException(defaultReason);
                        }
-                       throw new AssertException(errorMessage);
+
+                       throw new AssertException(errorMessage, new AssertException(
+                                       defaultReason));
                }
        }