Simplify default test suite.

4 files changed, 17 insertions, 12 deletions

diff --git a/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java b/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java
index 06c6d97..6ace3a0 100644
--- a/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java
+++ b/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java
@@ -10,7 +10,7 @@ import java.io.PrintStream;
 public abstract class BaseTextTestWriter implements TestWriter {
     private PrintStream output;
 
-    public static int BASE_WIDTH = 80;
+    public static int BASE_WIDTH = 90;
 
     public BaseTextTestWriter(PrintStream output) {
         this.output = output;
@@ -24,7 +24,7 @@ public abstract class BaseTextTestWriter implements TestWriter {
 
     protected abstract String testableString(Testable t);
 
-    private String testString(Test t, int offset) {
+    private String testString(Test t, String prefix) {
         if (!t.hasRun()) {
             return null;
         }
@@ -33,7 +33,7 @@ public abstract class BaseTextTestWriter implements TestWriter {
         StringBuilder out = new StringBuilder();
         out.append(t.ok() ? " OK " : "NOK ");
         out.append(compound ? "┳ " : "━ ");
-        int width = BASE_WIDTH - (offset + out.length());
+        int width = BASE_WIDTH - (prefix.length() + out.length());
         String widthSpec = "%-" + String.valueOf(width) + "s";
         out.append(String.format(widthSpec, t.getDescription()));
         out.append(" ┃ ");
@@ -47,11 +47,13 @@ public abstract class BaseTextTestWriter implements TestWriter {
             Test[] tests = test.getTests();
             for (int i = 0; i < tests.length; ++i) {
                 if (i == tests.length - 1) {
-                    out.append("    ┗ ");
+                    out.append(prefix).append("    ┗ ");
+                    out.append(testString(tests[i], prefix + "      "));
                 } else {
-                    out.append("    ┣ ");
+                    out.append(prefix).append("    ┣ ");
+                    out.append(testString(tests[i], prefix + "    ┃ "));
                 }
-                out.append(testString(tests[i], offset + 6));
+
                 if (i != tests.length - 1) {
                     out.append(System.lineSeparator());
                 }
@@ -67,7 +69,7 @@ public abstract class BaseTextTestWriter implements TestWriter {
     public void outputTest(Test t) {
         if (!t.hasRun())
             return;
-        output.println(testString(t, 0));
+        output.println(testString(t, ""));
         output.flush();
     }
 
diff --git a/src/cz/crcs/ectester/common/test/CompoundTest.java b/src/cz/crcs/ectester/common/test/CompoundTest.java
index bcf4a0e..3b0b542 100644
--- a/src/cz/crcs/ectester/common/test/CompoundTest.java
+++ b/src/cz/crcs/ectester/common/test/CompoundTest.java
@@ -34,7 +34,7 @@ public class CompoundTest extends Test {
         return new CompoundTest((tests) -> {
             for (Test test : tests) {
                 if (!Result.Value.fromExpected(what, test.ok()).ok()) {
-                    return new Result(Result.Value.FAILURE, "At least one of the sub-tests did not have the expected result.");
+                    return new Result(Result.Value.FAILURE, "Some sub-tests did not have the expected result.");
                 }
             }
             return new Result(Result.Value.SUCCESS, "All sub-tests had the expected result.");
@@ -51,7 +51,7 @@ public class CompoundTest extends Test {
         return new CompoundTest((tests) -> {
             for (Test test : tests) {
                 if (Result.Value.fromExpected(what, test.ok()).ok()) {
-                    return new Result(Result.Value.SUCCESS, "At least one of the sub-tests did have the expected result.");
+                    return new Result(Result.Value.SUCCESS, "Some sub-tests did have the expected result.");
                 }
             }
             return new Result(Result.Value.FAILURE, "None of the sub-tests had the expected result.");
@@ -68,7 +68,7 @@ public class CompoundTest extends Test {
         return new CompoundTest((tests) -> {
             for (int i = 0; i < results.length; ++i) {
                 if (!Result.Value.fromExpected(results[i], tests[i].ok()).ok()) {
-                    return new Result(Result.Value.FAILURE, "At least one of the sub-tests did not match the result mask.");
+                    return new Result(Result.Value.FAILURE, "Some sub-tests did not match the result mask.");
                 }
             }
             return new Result(Result.Value.SUCCESS, "All sub-tests matched the expected mask.");
@@ -93,6 +93,7 @@ public class CompoundTest extends Test {
         for (Test test : tests) {
             test.run();
         }
+
         result = callback.apply(tests);
         this.hasRun = true;
     }
diff --git a/src/cz/crcs/ectester/common/test/TestException.java b/src/cz/crcs/ectester/common/test/TestException.java
index 01d195c..008e9f6 100644
--- a/src/cz/crcs/ectester/common/test/TestException.java
+++ b/src/cz/crcs/ectester/common/test/TestException.java
@@ -1,7 +1,9 @@
 package cz.crcs.ectester.common.test;
 
 /**
- *
+ * A TestException is an Exception that can be thrown during the running of a Testable,
+ * or a TestSuite. It means that the Testable/TestSuite encountered an unexpected error
+ * during it's run which points to an error in ECTester or it's runtime environment.cd
  * @author Jan Jancar johny@neuromancer.sk
  */
 public class TestException extends Exception {
diff --git a/src/cz/crcs/ectester/common/test/Testable.java b/src/cz/crcs/ectester/common/test/Testable.java
index 3627075..5b84a45 100644
--- a/src/cz/crcs/ectester/common/test/Testable.java
+++ b/src/cz/crcs/ectester/common/test/Testable.java
@@ -21,7 +21,7 @@ public interface Testable {
     /**
      * Run this Runnable.
      *
-     * @throws TestException
+     * @throws TestException If an unexpected exception/error is encountered.
      */
     void run() throws TestException;
 }