From 22e4cfaf40a259be007bddc7b5cd765390de1c11 Mon Sep 17 00:00:00 2001
From: J08nY
Date: Sat, 10 Feb 2018 19:59:41 +0100
Subject: Handle exceptions in Tests and TestSuites grafeully.

---
 .../ectester/common/output/BaseYAMLTestWriter.java  | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java')

diff --git a/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java b/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java
index 0769e83..1e13082 100644
--- a/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java
+++ b/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java
@@ -41,6 +41,14 @@ public abstract class BaseYAMLTestWriter implements TestWriter {
 
     abstract protected Map<String, Object> deviceObject(TestSuite suite);
 
+    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());
+        return resultObject;
+    }
+
     private Map<String, Object> testObject(Test t) {
         Map<String, Object> testObj;
         if (t instanceof CompoundTest) {
@@ -48,7 +56,7 @@ public abstract class BaseYAMLTestWriter implements TestWriter {
             testObj = new HashMap<>();
             testObj.put("type", "compound");
             List<Map<String, Object>> innerTests = new LinkedList<>();
-            for (Test innerTest : test.getTests()) {
+            for (Test innerTest : test.getStartedTests()) {
                 innerTests.add(testObject(innerTest));
             }
             testObj.put("tests", innerTests);
@@ -58,11 +66,7 @@ public abstract class BaseYAMLTestWriter implements TestWriter {
         }
 
         testObj.put("desc", t.getDescription());
-        Map<String, Object> result = new HashMap<>();
-        result.put("ok", t.ok());
-        result.put("value", t.getResultValue().name());
-        result.put("cause", t.getResultCause());
-        testObj.put("result", result);
+        testObj.put("result", resultObject(t.getResult()));
 
         return testObj;
     }
@@ -74,6 +78,11 @@ public abstract class BaseYAMLTestWriter implements TestWriter {
         tests.add(testObject(t));
     }
 
+    @Override
+    public void outputError(Test t, Throwable cause) {
+        tests.add(testObject(t));
+    }
+
     @Override
     public void end() {
         DumperOptions options = new DumperOptions();
-- 
cgit v1.2.3-70-g09d2