From 31a8bfc6f8d2990f8bc9e4a126731052e07b7e10 Mon Sep 17 00:00:00 2001
From: J08nY
Date: Sun, 11 Feb 2018 01:05:47 +0100
Subject: Output Result causes better in YAML.

---
 .../crcs/ectester/common/output/BaseXMLTestWriter.java  |  2 --
 .../crcs/ectester/common/output/BaseYAMLTestWriter.java | 17 ++++++++++++++++-
 src/cz/crcs/ectester/reader/test/CommandTestable.java   |  1 +
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/cz/crcs/ectester/common/output/BaseXMLTestWriter.java b/src/cz/crcs/ectester/common/output/BaseXMLTestWriter.java
index fca3e68..800f893 100644
--- a/src/cz/crcs/ectester/common/output/BaseXMLTestWriter.java
+++ b/src/cz/crcs/ectester/common/output/BaseXMLTestWriter.java
@@ -52,8 +52,6 @@ public abstract class BaseXMLTestWriter implements TestWriter {
     private String causeString(Object cause) {
         if (cause == null) {
             return "null";
-        } else if (cause instanceof String) {
-            return (String) cause;
         } else if (cause instanceof Throwable) {
             StringBuilder sb = new StringBuilder();
             for (Throwable t = (Throwable) cause; t != null; t = t.getCause()) {
diff --git a/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java b/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java
index 1e13082..1452b08 100644
--- a/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java
+++ b/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java
@@ -41,11 +41,26 @@ public abstract class BaseYAMLTestWriter implements TestWriter {
 
     abstract protected Map<String, Object> deviceObject(TestSuite suite);
 
+    private Object causeObject(Object cause) {
+        if (cause == null) {
+            return null;
+        } else if (cause instanceof Throwable) {
+            StringBuilder sb = new StringBuilder();
+            for (Throwable t = (Throwable) cause; t != null; t = t.getCause()) {
+                sb.append(t.toString());
+                sb.append(System.lineSeparator());
+            }
+            return sb.toString();
+        } else {
+            return cause.toString();
+        }
+    }
+
     private Map<String, Object> resultObject(Result result) {
         Map<String, Object> resultObject = new HashMap<>();
         resultObject.put("ok", result.ok());
         resultObject.put("value", result.getValue().name());
-        resultObject.put("cause", result.getCause());
+        resultObject.put("cause", causeObject(result.getCause()));
         return resultObject;
     }
 
diff --git a/src/cz/crcs/ectester/reader/test/CommandTestable.java b/src/cz/crcs/ectester/reader/test/CommandTestable.java
index f670534..e3dbd05 100644
--- a/src/cz/crcs/ectester/reader/test/CommandTestable.java
+++ b/src/cz/crcs/ectester/reader/test/CommandTestable.java
@@ -28,6 +28,7 @@ public class CommandTestable extends BaseTestable {
 
     @Override
     public void run() {
+
         try {
             response = command.send();
         } catch (CardException e) {
-- 
cgit v1.2.3-70-g09d2