Export CPLC data and card ATR in test suite outputs.

3 files changed, 9 insertions, 0 deletions

diff --git a/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java b/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java
index 6ace3a0..29eb671 100644
--- a/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java
+++ b/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java
@@ -20,10 +20,13 @@ public abstract class BaseTextTestWriter implements TestWriter {
     public void begin(TestSuite suite) {
         output.println("═══ Running test suite: " + suite.getName() + " ═══");
         output.println("═══ " + suite.getDescription());
+        output.print(deviceString(suite));
     }
 
     protected abstract String testableString(Testable t);
 
+    protected abstract String deviceString(TestSuite suite);
+
     private String testString(Test t, String prefix) {
         if (!t.hasRun()) {
             return null;
diff --git a/src/cz/crcs/ectester/common/output/BaseXMLTestWriter.java b/src/cz/crcs/ectester/common/output/BaseXMLTestWriter.java
index 9d3c8f3..f3e9411 100644
--- a/src/cz/crcs/ectester/common/output/BaseXMLTestWriter.java
+++ b/src/cz/crcs/ectester/common/output/BaseXMLTestWriter.java
@@ -39,10 +39,13 @@ public abstract class BaseXMLTestWriter implements TestWriter {
 
         root = rootElem;
         doc.appendChild(root);
+        root.appendChild(deviceElement(suite));
     }
 
     protected abstract Element testableElement(Testable t);
 
+    protected abstract Element deviceElement(TestSuite suite);
+
     private Element testElement(Test t) {
         Element testElem;
         if (t instanceof CompoundTest) {
diff --git a/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java b/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java
index af76927..0769e83 100644
--- a/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java
+++ b/src/cz/crcs/ectester/common/output/BaseYAMLTestWriter.java
@@ -33,11 +33,14 @@ public abstract class BaseYAMLTestWriter implements TestWriter {
         testSuite.put("desc", suite.getDescription());
 
         testRun.put("suite", testSuite);
+        testRun.put("device", deviceObject(suite));
         testRun.put("tests", tests);
     }
 
     abstract protected Map<String, Object> testableObject(Testable t);
 
+    abstract protected Map<String, Object> deviceObject(TestSuite suite);
+
     private Map<String, Object> testObject(Test t) {
         Map<String, Object> testObj;
         if (t instanceof CompoundTest) {