From e5984d7304101070a5bb9daf1b996dc85e59a800 Mon Sep 17 00:00:00 2001
From: J08nY
Date: Thu, 5 Jul 2018 20:20:55 +0200
Subject: Also export test index in YAML and XML.

---
 src/cz/crcs/ectester/common/output/BaseXMLTestWriter.java  | 12 ++++++++----
 src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java | 11 +++++++----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/cz/crcs/ectester/common/output/BaseXMLTestWriter.java b/src/cz/crcs/ectester/common/output/BaseXMLTestWriter.java
index b666e08..53970dd 100644
--- a/src/cz/crcs/ectester/common/output/BaseXMLTestWriter.java
+++ b/src/cz/crcs/ectester/common/output/BaseXMLTestWriter.java
@@ -87,14 +87,14 @@ public abstract class BaseXMLTestWriter implements TestWriter {
         return resultElem;
     }
 
-    private Element testElement(Test t) {
+    private Element testElement(Test t, int index) {
         Element testElem;
         if (t instanceof CompoundTest) {
             CompoundTest test = (CompoundTest) t;
             testElem = doc.createElement("test");
             testElem.setAttribute("type", "compound");
             for (Test innerTest : test.getStartedTests()) {
-                testElem.appendChild(testElement(innerTest));
+                testElem.appendChild(testElement(innerTest, -1));
             }
         } else {
             SimpleTest<? extends BaseTestable> test = (SimpleTest<? extends BaseTestable>) t;
@@ -108,6 +108,10 @@ public abstract class BaseXMLTestWriter implements TestWriter {
         Element result = resultElement(t.getResult());
         testElem.appendChild(result);
 
+        if (index != -1) {
+            testElem.setAttribute("index", String.valueOf(index));
+        }
+
         return testElem;
     }
 
@@ -115,12 +119,12 @@ public abstract class BaseXMLTestWriter implements TestWriter {
     public void outputTest(Test t, int index) {
         if (!t.hasRun())
             return;
-        tests.appendChild(testElement(t));
+        tests.appendChild(testElement(t, index));
     }
 
     @Override
     public void outputError(Test t, Throwable cause, int index) {
-        tests.appendChild(testElement(t));
+        tests.appendChild(testElement(t, index));
     }
 
     @Override
diff --git a/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java b/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java
index e3c7952..e054563 100644
--- a/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java
+++ b/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java
@@ -66,7 +66,7 @@ public abstract class BaseYAMLTestWriter implements TestWriter {
         return resultObject;
     }
 
-    private Map<String, Object> testObject(Test t) {
+    private Map<String, Object> testObject(Test t, int index) {
         Map<String, Object> testObj;
         if (t instanceof CompoundTest) {
             CompoundTest test = (CompoundTest) t;
@@ -74,7 +74,7 @@ public abstract class BaseYAMLTestWriter implements TestWriter {
             testObj.put("type", "compound");
             List<Map<String, Object>> innerTests = new LinkedList<>();
             for (Test innerTest : test.getStartedTests()) {
-                innerTests.add(testObject(innerTest));
+                innerTests.add(testObject(innerTest, -1));
             }
             testObj.put("tests", innerTests);
         } else {
@@ -84,6 +84,9 @@ public abstract class BaseYAMLTestWriter implements TestWriter {
 
         testObj.put("desc", t.getDescription());
         testObj.put("result", resultObject(t.getResult()));
+        if (index != -1) {
+            testObj.put("index", index);
+        }
 
         return testObj;
     }
@@ -92,12 +95,12 @@ public abstract class BaseYAMLTestWriter implements TestWriter {
     public void outputTest(Test t, int index) {
         if (!t.hasRun())
             return;
-        tests.add(testObject(t));
+        tests.add(testObject(t, index));
     }
 
     @Override
     public void outputError(Test t, Throwable cause, int index) {
-        tests.add(testObject(t));
+        tests.add(testObject(t, index));
     }
 
     @Override
-- 
cgit v1.2.3-70-g09d2