diff options
| author | J08nY | 2018-01-13 01:15:44 +0100 |
|---|---|---|
| committer | J08nY | 2018-01-13 01:15:44 +0100 |
| commit | eca4e6a299c5765b1bb2fa17113bc12c84d8a406 (patch) | |
| tree | 2c71746f53696df05edee2ada11586b6991f63d7 /src/cz/crcs/ectester/common/test | |
| parent | 94e441b522069d3fed4b88a4823b91c1593bac68 (diff) | |
| download | ECTester-eca4e6a299c5765b1bb2fa17113bc12c84d8a406.tar.gz ECTester-eca4e6a299c5765b1bb2fa17113bc12c84d8a406.tar.zst ECTester-eca4e6a299c5765b1bb2fa17113bc12c84d8a406.zip | |
Simplify default test suite.
Diffstat (limited to 'src/cz/crcs/ectester/common/test')
| -rw-r--r-- | src/cz/crcs/ectester/common/test/CompoundTest.java | 7 | ||||
| -rw-r--r-- | src/cz/crcs/ectester/common/test/TestException.java | 4 | ||||
| -rw-r--r-- | src/cz/crcs/ectester/common/test/Testable.java | 2 |
3 files changed, 8 insertions, 5 deletions
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; } |
