Refactor response and test outputing into separate writers.

This is done to provide multiple output formats, one which logs
tests to console in simple human readable format and others.

1 files changed, 14 insertions, 7 deletions

diff --git a/src/cz/crcs/ectester/reader/test/Test.java b/src/cz/crcs/ectester/reader/test/Test.java
index cd0cf49..cb885e5 100644
--- a/src/cz/crcs/ectester/reader/test/Test.java
+++ b/src/cz/crcs/ectester/reader/test/Test.java
@@ -31,6 +31,8 @@ public abstract class Test {
 
     public abstract void run() throws CardException;
 
+    public abstract String getDescription();
+
     /**
      * A result of a Test.
      */
@@ -93,12 +95,8 @@ public abstract class Test {
         }
 
         @Override
-        public String toString() {
-            if (hasRun) {
-                return (ok() ? "OK " : "NOK") + " " + response.toString();
-            } else {
-                return "";
-            }
+        public String getDescription() {
+            return response.getDescription();
         }
     }
 
@@ -140,6 +138,10 @@ public abstract class Test {
             }, any);
         }
 
+        public Test[] getTests() {
+            return tests;
+        }
+
         @Override
         public boolean ok() {
             return result == Result.SUCCESS;
@@ -147,10 +149,15 @@ public abstract class Test {
 
         @Override
         public void run() throws CardException {
-            for (Test test: tests) {
+            for (Test test : tests) {
                 test.run();
             }
             result = callback.apply(tests);
         }
+
+        @Override
+        public String getDescription() {
+            return "";
+        }
     }
 }