X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Ftest%2FTestCase.java;h=a62cb0b79646752fb9b37ffca7c4173dc795cac7;hb=6a493e0518e4b88cc68f6d4aae1faea08aa3afce;hp=243acac2b28243a781c5de9eef56b31ab76e5a9e;hpb=db31c35860081535d6e7ddc83ab4af573bb0522e;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/test/TestCase.java b/src/be/nikiroo/utils/test/TestCase.java
index 243acac..a62cb0b 100644
--- a/src/be/nikiroo/utils/test/TestCase.java
+++ b/src/be/nikiroo/utils/test/TestCase.java
@@ -42,6 +42,7 @@ abstract public class TestCase {
 	 * @throws Exception
 	 *             in case of error
 	 */
+	@SuppressWarnings("unused")
 	public void setUp() throws Exception {
 	}
 
@@ -51,6 +52,7 @@ abstract public class TestCase {
 	 * @throws Exception
 	 *             in case of error
 	 */
+	@SuppressWarnings("unused")
 	public void tearDown() throws Exception {
 	}
 
@@ -130,10 +132,10 @@ abstract public class TestCase {
 			if (errorMessage == null) {
 				throw new AssertException(generateAssertMessage(expected,
 						actual));
-			} else {
-				throw new AssertException(errorMessage, new AssertException(
-						generateAssertMessage(expected, actual)));
 			}
+
+			throw new AssertException(errorMessage, new AssertException(
+					generateAssertMessage(expected, actual)));
 		}
 	}
 
@@ -149,7 +151,7 @@ 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));
 	}
 
 	/**
@@ -167,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));
 	}
 
 	/**
@@ -183,7 +185,7 @@ 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));
 	}
 
 	/**
@@ -201,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));
 	}
 
 	/**
@@ -217,7 +220,7 @@ 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));
 	}
 
 	/**
@@ -235,7 +238,8 @@ 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));
 	}
 
 	/**
@@ -253,15 +257,15 @@ abstract public class TestCase {
 			throws AssertException {
 		if (actual == null) {
 			String defaultReason = String.format("" //
-					+ "Assertion failed!\n" //
-					+ "Object should have been NULL: [%s]", actual);
+					+ "Assertion failed!%n" //
+					+ "Object should not have been NULL");
 
 			if (errorMessage == null) {
 				throw new AssertException(defaultReason);
-			} else {
-				throw new AssertException(errorMessage, new AssertException(
-						defaultReason));
 			}
+
+			throw new AssertException(errorMessage, new AssertException(
+					defaultReason));
 		}
 	}
 
@@ -278,8 +282,8 @@ abstract public class TestCase {
 	 */
 	public static String generateAssertMessage(Object expected, Object actual) {
 		return String.format("" //
-				+ "Assertion failed!\n" //
-				+ "Expected value: [%s]\n" //
+				+ "Assertion failed!%n" //
+				+ "Expected value: [%s]%n" //
 				+ "Actual value: [%s]", expected, actual);
 	}
 }