X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Ftest%2FTestCase.java;h=0479370f64df57bc5e27a809ee706b0908005f85;hb=72648e757f648cd152bc00dfb83f895260f037a0;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..0479370 100644
--- a/src/be/nikiroo/utils/test/TestCase.java
+++ b/src/be/nikiroo/utils/test/TestCase.java
@@ -1,5 +1,7 @@
 package be.nikiroo.utils.test;
 
+import java.util.List;
+
 /**
  * A {@link TestCase} that can be run with {@link TestLauncher}.
  * 
@@ -36,6 +38,15 @@ abstract public class TestCase {
 		this.name = name;
 	}
 
+	/**
+	 * This constructor can be used if you require a no-param constructor. In
+	 * this case, you are allowed to set the name manually via
+	 * {@link TestCase#setName}.
+	 */
+	protected TestCase() {
+		this("no name");
+	}
+
 	/**
 	 * Setup the test (called before the test is run).
 	 * 
@@ -63,6 +74,20 @@ abstract public class TestCase {
 		return name;
 	}
 
+	/**
+	 * The test name.
+	 * 
+	 * @param name
+	 *            the new name (internal use only)
+	 * 
+	 * @return this (so we can chain and so we can initialize it in a member
+	 *         variable if this is an anonymous inner class)
+	 */
+	protected TestCase setName(String name) {
+		this.name = name;
+		return this;
+	}
+
 	/**
 	 * Actually do the test.
 	 * 
@@ -130,15 +155,15 @@ 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)));
 		}
 	}
 
 	/**
-	 * Check that 2 {@link Object}s are equals.
+	 * Check that 2 longs are equals.
 	 * 
 	 * @param expected
 	 *            the expected value
@@ -149,11 +174,11 @@ 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.
+	 * Check that 2 longs are equals.
 	 * 
 	 * @param errorMessage
 	 *            the error message to display if they differ
@@ -167,11 +192,11 @@ 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));
 	}
 
 	/**
-	 * Check that 2 {@link Object}s are equals.
+	 * Check that 2 booleans are equals.
 	 * 
 	 * @param expected
 	 *            the expected value
@@ -183,11 +208,11 @@ 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.
+	 * Check that 2 booleans are equals.
 	 * 
 	 * @param errorMessage
 	 *            the error message to display if they differ
@@ -201,11 +226,12 @@ 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));
 	}
 
 	/**
-	 * Check that 2 {@link Object}s are equals.
+	 * Check that 2 doubles are equals.
 	 * 
 	 * @param expected
 	 *            the expected value
@@ -217,11 +243,11 @@ 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.
+	 * Check that 2 doubles are equals.
 	 * 
 	 * @param errorMessage
 	 *            the error message to display if they differ
@@ -235,7 +261,57 @@ 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 2 {@link List}s are equals.
+	 * 
+	 * @param errorMessage
+	 *            the error message to display if they differ
+	 * @param expected
+	 *            the expected value
+	 * @param actual
+	 *            the actual value
+	 * 
+	 * @throws AssertException
+	 *             in case they differ
+	 */
+	public void assertEquals(List<?> expected, List<?> actual)
+			throws AssertException {
+		assertEquals("Assertion failed", expected, actual);
+	}
+
+	/**
+	 * Check that 2 {@link List}s are equals.
+	 * 
+	 * @param errorMessage
+	 *            the error message to display if they differ
+	 * @param expected
+	 *            the expected value
+	 * @param actual
+	 *            the actual value
+	 * @param errorMessage
+	 *            the error message to display if they differ
+	 * 
+	 * @throws AssertException
+	 *             in case they differ
+	 */
+	public void assertEquals(String errorMessage, List<?> expected,
+			List<?> actual) throws AssertException {
+
+		if (expected.size() != actual.size()) {
+			assertEquals(errorMessage + ": not same number of items",
+					list(expected), list(actual));
+		}
+
+		int size = expected.size();
+		for (int i = 0; i < size; i++) {
+			assertEquals(errorMessage + ": item " + i
+					+ " (0-based) is not correct", expected.get(i),
+					actual.get(i));
+		}
 	}
 
 	/**
@@ -253,15 +329,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 +354,29 @@ 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);
 	}
+
+	private static String list(List<?> items) {
+		StringBuilder builder = new StringBuilder();
+		for (Object item : items) {
+			if (builder.length() == 0) {
+				builder.append(items.size() + " item(s): ");
+			} else {
+				builder.append(", ");
+			}
+
+			builder.append("" + item);
+
+			if (builder.length() > 60) {
+				builder.setLength(57);
+				builder.append("...");
+				break;
+			}
+		}
+
+		return builder.toString();
+	}
 }