2 files changed, 63 insertions, 3 deletions

diff --git a/src/cz/crcs/ectester/reader/ECTester.java b/src/cz/crcs/ectester/reader/ECTester.java
index 016e095..be09986 100644
--- a/src/cz/crcs/ectester/reader/ECTester.java
+++ b/src/cz/crcs/ectester/reader/ECTester.java
@@ -117,7 +117,7 @@ public class ECTester {
                         writer = new XMLOutputWriter(logger.getOutputStream());
                         break;
                     case "yaml":
-                        writer = new YAMLOutputWriter();
+                        writer = new YAMLOutputWriter(logger.getPrintStream());
                         break;
                 }
             }
diff --git a/src/cz/crcs/ectester/reader/output/YAMLOutputWriter.java b/src/cz/crcs/ectester/reader/output/YAMLOutputWriter.java
index 34ff29a..e81cbad 100644
--- a/src/cz/crcs/ectester/reader/output/YAMLOutputWriter.java
+++ b/src/cz/crcs/ectester/reader/output/YAMLOutputWriter.java
@@ -1,29 +1,89 @@
 package cz.crcs.ectester.reader.output;
 
+import cz.crcs.ectester.reader.Util;
 import cz.crcs.ectester.reader.response.Response;
 import cz.crcs.ectester.reader.test.Test;
+import org.yaml.snakeyaml.DumperOptions;
+import org.yaml.snakeyaml.Yaml;
+
+import java.io.PrintStream;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author Jan Jancar johny@neuromancer.sk
  */
 public class YAMLOutputWriter implements OutputWriter {
+    private PrintStream output;
+    private List<Object> testRun;
+
+    public YAMLOutputWriter(PrintStream output) {
+        this.output = output;
+    }
+
     @Override
     public void begin() {
+        output.println("---");
+        testRun = new LinkedList<>();
+    }
 
+    private Map<String, Object> responseObject(Response r) {
+        Map<String, Object> responseObj = new HashMap<>();
+        responseObj.put("successful", r.successful());
+        responseObj.put("apdu", Util.bytesToHex(r.getAPDU().getBytes()));
+        responseObj.put("natural_sw", r.getNaturalSW());
+        List<Short> sws = new LinkedList<>();
+        for (int i = 0; i < r.getNumSW(); ++i) {
+            sws.add(r.getSW(i));
+        }
+        responseObj.put("sws", sws);
+        responseObj.put("duration", r.getDuration());
+        responseObj.put("desc", r.getDescription());
+        return responseObj;
     }
 
     @Override
     public void outputResponse(Response r) {
+        testRun.add(responseObject(r));
+    }
 
+    private Map<String, Object> testObject(Test t) {
+        Map<String, Object> testObj = new HashMap<>();
+
+        if (t instanceof Test.Simple) {
+            Test.Simple test = (Test.Simple) t;
+            testObj.put("type", "simple");
+            testObj.put("response", responseObject(test.getResponse()));
+        } else if (t instanceof Test.Compound) {
+            Test.Compound test = (Test.Compound) t;
+            testObj.put("type", "compound");
+            List<Map<String, Object>> tests = new LinkedList<>();
+            for (Test innerTest : test.getTests()) {
+                tests.add(testObject(innerTest));
+            }
+            testObj.put("tests", tests);
+        }
+
+        testObj.put("desc", t.getDescription());
+        testObj.put("result", t.getResult().name());
+
+        return testObj;
     }
 
     @Override
     public void outputTest(Test t) {
-
+        testRun.add(testObject(t));
     }
 
     @Override
     public void end() {
-
+        DumperOptions options = new DumperOptions();
+        options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
+        Yaml yaml = new Yaml(options);
+        String out = yaml.dump(testRun);
+        output.println(out);
+        output.println("---");
     }
 }