diff options
| author | J08nY | 2017-12-27 18:51:17 +0100 |
|---|---|---|
| committer | J08nY | 2017-12-27 18:51:17 +0100 |
| commit | e48b7651e98934ef80a8094a6c85407e4584f3c2 (patch) | |
| tree | bd38218eab9d75dfb0bb6a97f5c4fc65c9a14129 | |
| parent | f40db310cdb28d39e1bb050e9adb920f4b35a8ed (diff) | |
| download | ECTester-e48b7651e98934ef80a8094a6c85407e4584f3c2.tar.gz ECTester-e48b7651e98934ef80a8094a6c85407e4584f3c2.tar.zst ECTester-e48b7651e98934ef80a8094a6c85407e4584f3c2.zip | |
5 files changed, 6 insertions, 37 deletions
diff --git a/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java b/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java index 7e0e1a3..06c6d97 100644 --- a/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java +++ b/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java @@ -18,8 +18,8 @@ public abstract class BaseTextTestWriter implements TestWriter { @Override public void begin(TestSuite suite) { - output.println("=== Running test suite: " + suite.getName() + " ==="); - output.println("=== " + suite.getDescription()); + output.println("═══ Running test suite: " + suite.getName() + " ═══"); + output.println("═══ " + suite.getDescription()); } protected abstract String testableString(Testable t); @@ -28,10 +28,11 @@ public abstract class BaseTextTestWriter implements TestWriter { if (!t.hasRun()) { return null; } + boolean compound = t instanceof CompoundTest; StringBuilder out = new StringBuilder(); - out.append(t.ok() ? "OK " : "NOK "); - out.append("━ "); + out.append(t.ok() ? " OK " : "NOK "); + out.append(compound ? "┳ " : "━ "); int width = BASE_WIDTH - (offset + out.length()); String widthSpec = "%-" + String.valueOf(width) + "s"; out.append(String.format(widthSpec, t.getDescription())); @@ -39,7 +40,7 @@ public abstract class BaseTextTestWriter implements TestWriter { out.append(String.format("%-9s", t.getResultValue().name())); out.append(" ┃ "); - if (t instanceof CompoundTest) { + if (compound) { CompoundTest test = (CompoundTest) t; out.append(test.getResultCause()); out.append(System.lineSeparator()); diff --git a/src/cz/crcs/ectester/common/test/BaseTestable.java b/src/cz/crcs/ectester/common/test/BaseTestable.java index f8ebf48..f376299 100644 --- a/src/cz/crcs/ectester/common/test/BaseTestable.java +++ b/src/cz/crcs/ectester/common/test/BaseTestable.java @@ -1,9 +1,5 @@ package cz.crcs.ectester.common.test; -import java.util.Collections; -import java.util.Map; -import java.util.TreeMap; - /** * @author Jan Jancar johny@neuromancer.sk */ @@ -12,8 +8,6 @@ public abstract class BaseTestable implements Testable { protected boolean ok; protected boolean error; - protected Map<String, Object> meta = new TreeMap<>(); - @Override public boolean hasRun() { return hasRun; @@ -28,9 +22,4 @@ public abstract class BaseTestable implements Testable { public boolean error() { return error; } - - @Override - public Map<String, Object> meta() { - return Collections.unmodifiableMap(meta); - } } diff --git a/src/cz/crcs/ectester/common/test/Test.java b/src/cz/crcs/ectester/common/test/Test.java index 5f55337..4f5bb6e 100644 --- a/src/cz/crcs/ectester/common/test/Test.java +++ b/src/cz/crcs/ectester/common/test/Test.java @@ -1,8 +1,5 @@ package cz.crcs.ectester.common.test; -import java.util.Collections; -import java.util.Map; - import static cz.crcs.ectester.common.test.Result.Value; /** @@ -13,7 +10,6 @@ import static cz.crcs.ectester.common.test.Result.Value; public abstract class Test implements Testable { protected boolean hasRun; protected Result result; - protected Map<String, Object> meta; public Result getResult() { if (!hasRun) { @@ -56,11 +52,6 @@ public abstract class Test implements Testable { return hasRun; } - @Override - public Map<String, Object> meta() { - return Collections.unmodifiableMap(meta); - } - public abstract String getDescription(); @Override diff --git a/src/cz/crcs/ectester/common/test/Testable.java b/src/cz/crcs/ectester/common/test/Testable.java index e8eb321..001121b 100644 --- a/src/cz/crcs/ectester/common/test/Testable.java +++ b/src/cz/crcs/ectester/common/test/Testable.java @@ -1,7 +1,5 @@ package cz.crcs.ectester.common.test; -import java.util.Map; - /** * @author Jan Jancar johny@neuromancer.sk */ @@ -28,11 +26,4 @@ public interface Testable { * @return Whether an error happened. */ boolean error(); - - /** - * Get the metadata of this Testable. - * - * @return The metadata of the testable. - */ - Map<String, Object> meta(); } diff --git a/src/cz/crcs/ectester/reader/test/CommandTestable.java b/src/cz/crcs/ectester/reader/test/CommandTestable.java index 4025c61..3bb55bf 100644 --- a/src/cz/crcs/ectester/reader/test/CommandTestable.java +++ b/src/cz/crcs/ectester/reader/test/CommandTestable.java @@ -40,8 +40,5 @@ public class CommandTestable extends BaseTestable { } else if (response.successful()) { ok = true; } - meta.clear(); - meta.put("natural-sw", response.getNaturalSW()); - meta.put("sws", response.getSWs()); } } |
