X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Ftest%2FTestLauncher.java;h=d01e0f802cf026f1aa886d6c99d2917538a67693;hp=ba4e81de22262f23a8e9161c2b2b81fec4413c15;hb=e9ca6bb892b5358a273807bff834945ffe7b0cee;hpb=80383c142f85a7850d0fbea418689608fdccac05

diff --git a/src/be/nikiroo/utils/test/TestLauncher.java b/src/be/nikiroo/utils/test/TestLauncher.java
index ba4e81d..d01e0f8 100644
--- a/src/be/nikiroo/utils/test/TestLauncher.java
+++ b/src/be/nikiroo/utils/test/TestLauncher.java
@@ -1,5 +1,7 @@
 package be.nikiroo.utils.test;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -18,7 +20,7 @@ public class TestLauncher {
 	private class SetupException extends Exception {
 		private static final long serialVersionUID = 1L;
 
-		public SetupException(Exception e) {
+		public SetupException(Throwable e) {
 			super(e);
 		}
 	}
@@ -31,7 +33,7 @@ public class TestLauncher {
 	private class TearDownException extends Exception {
 		private static final long serialVersionUID = 1L;
 
-		public TearDownException(Exception e) {
+		public TearDownException(Throwable e) {
 			super(e);
 		}
 	}
@@ -47,6 +49,8 @@ public class TestLauncher {
 	protected int executed;
 	protected int total;
 
+	private int currentSeries = 0;
+
 	/**
 	 * Create a new {@link TestLauncher} with default parameters.
 	 * 
@@ -144,10 +148,12 @@ public class TestLauncher {
 				System.out.println("");
 			}
 
+			currentSeries = 0;
 			for (TestLauncher serie : series) {
 				errors += serie.launch(depth + 1);
 				executed += serie.executed;
 				total += serie.total;
+				currentSeries++;
 			}
 		} catch (Exception e) {
 			print(depth, "__start");
@@ -179,20 +185,20 @@ public class TestLauncher {
 		for (TestCase test : tests) {
 			print(depth, test.getName());
 
-			Exception ex = null;
+			Throwable ex = null;
 			try {
 				try {
 					test.setUp();
-				} catch (Exception e) {
+				} catch (Throwable e) {
 					throw new SetupException(e);
 				}
 				test.test();
 				try {
 					test.tearDown();
-				} catch (Exception e) {
+				} catch (Throwable e) {
 					throw new TearDownException(e);
 				}
-			} catch (Exception e) {
+			} catch (Throwable e) {
 				ex = e;
 			}
 
@@ -263,7 +269,7 @@ public class TestLauncher {
 			System.out.println("[ Test suite: " + name + " ]");
 			System.out.println("");
 		} else {
-			System.out.println(prefix(depth) + name + ":");
+			System.out.println(prefix(depth, false) + name + ":");
 		}
 	}
 
@@ -276,7 +282,8 @@ public class TestLauncher {
 	 *            the {@link TestCase}
 	 */
 	protected void print(int depth, String name) {
-		name = prefix(depth) + (name == null ? "" : name).replace("\t", "    ");
+		name = prefix(depth, false)
+				+ (name == null ? "" : name).replace("\t", "    ");
 
 		while (name.length() < columns - 11) {
 			name += ".";
@@ -293,11 +300,15 @@ public class TestLauncher {
 	 * @param error
 	 *            the {@link Exception} it ran into if any
 	 */
-	private void print(int depth, Exception error) {
+	private void print(int depth, Throwable error) {
 		if (error != null) {
 			System.out.println(" " + koString);
-			for (String line : (error.getMessage() + "").split("\n")) {
-				System.out.println(prefix(depth) + "\t\t" + line);
+			StringWriter sw = new StringWriter();
+			PrintWriter pw = new PrintWriter(sw);
+			error.printStackTrace(pw);
+			String lines = sw.toString();
+			for (String line : lines.split("\n")) {
+				System.out.println(prefix(depth, false) + "\t\t" + line);
 			}
 		} else {
 			System.out.println(" " + okString);
@@ -332,11 +343,10 @@ public class TestLauncher {
 		if (depth == 0) {
 			System.out.println(resume);
 		} else {
-			String arrow = "┗▶";
-			if (series.isEmpty()) {
-				arrow = "━▶";
-			}
-			System.out.println(prefix(depth) + arrow + resume);
+			String arrow = "┗▶ ";
+			System.out.println(prefix(depth, currentSeries == 0) + arrow
+					+ resume);
+			System.out.println(prefix(depth, currentSeries == 0));
 		}
 	}
 
@@ -347,22 +357,25 @@ public class TestLauncher {
 	 * 
 	 * @param depth
 	 *            the current depth
+	 * @param first
+	 *            this line is the first of its tabulation level
 	 * 
 	 * @return the prefix
 	 */
-	private String prefix(int depth) {
+	private String prefix(int depth, boolean first) {
 		String space = tabs(depth - 1);
 
 		String line = "";
 		if (depth > 0) {
 			if (depth > 1) {
-				if (depth != last) {
+				if (depth != last && first) {
 					line = "╻"; // first line
 				} else {
 					line = "┃"; // continuation
 				}
 			}
-			space = space + line + tabs(1);
+
+			space += line + tabs(1);
 		}
 
 		last = depth;
@@ -378,7 +391,6 @@ public class TestLauncher {
 	 * @return the string
 	 */
 	private String tabs(int depth) {
-
 		StringBuilder builder = new StringBuilder();
 		for (int i = 0; i < depth; i++) {
 			builder.append("    ");