Add Compund test to test-vectors suite.

2 files changed, 20 insertions, 10 deletions

diff --git a/src/cz/crcs/ectester/reader/output/TextOutputWriter.java b/src/cz/crcs/ectester/reader/output/TextOutputWriter.java
index 6887f61..d9669be 100644
--- a/src/cz/crcs/ectester/reader/output/TextOutputWriter.java
+++ b/src/cz/crcs/ectester/reader/output/TextOutputWriter.java
@@ -47,22 +47,28 @@ public class TextOutputWriter implements OutputWriter {
         output.flush();
     }
 
-    @Override
-    public void outputTest(Test t) {
+    private String testString(Test t) {
         if (!t.hasRun())
-            return;
+            return null;
 
-        String out = "";
+        StringBuilder out = new StringBuilder();
         if (t instanceof Test.Simple) {
             Test.Simple test = (Test.Simple) t;
-            out += String.format("%-62s:", testPrefix(t) + " " + test.getDescription()) + " : ";
-            out += responseSuffix(test.getResponse());
-        } else if (t instanceof  Test.Compound) {
+            out.append(String.format("%-62s:", testPrefix(t) + " " + test.getDescription())).append(" : ");
+            out.append(responseSuffix(test.getResponse()));
+        } else if (t instanceof Test.Compound) {
             Test.Compound test = (Test.Compound) t;
-            out += String.format("%-62s:", testPrefix(t) + " " + test.getDescription());
+            for (Test innerTest : test.getTests()) {
+                out.append("    ").append(testString(innerTest)).append(System.lineSeparator());
+            }
+            out.append(String.format("%-62s:", testPrefix(t) + " " + test.getDescription()));
         }
+        return out.toString();
+    }
 
-        output.println(out);
+    @Override
+    public void outputTest(Test t) {
+        output.println(testString(t));
         output.flush();
     }
 
diff --git a/src/cz/crcs/ectester/reader/output/YAMLOutputWriter.java b/src/cz/crcs/ectester/reader/output/YAMLOutputWriter.java
index e81cbad..211bd47 100644
--- a/src/cz/crcs/ectester/reader/output/YAMLOutputWriter.java
+++ b/src/cz/crcs/ectester/reader/output/YAMLOutputWriter.java
@@ -82,7 +82,11 @@ public class YAMLOutputWriter implements OutputWriter {
         DumperOptions options = new DumperOptions();
         options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
         Yaml yaml = new Yaml(options);
-        String out = yaml.dump(testRun);
+
+        Map<String, List<Object>> result = new HashMap<>();
+        result.put("testRun", testRun);
+        String out = yaml.dump(result);
+
         output.println(out);
         output.println("---");
     }