From aeb322e1da26dcfc83762d9bc8df83667a22282a Mon Sep 17 00:00:00 2001
From: J08nY
Date: Sun, 14 Jan 2018 15:26:30 +0100
Subject: Export CPLC data and card ATR in test suite outputs.

---
 .../ectester/reader/output/YAMLTestWriter.java     | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)

(limited to 'src/cz/crcs/ectester/reader/output/YAMLTestWriter.java')

diff --git a/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java b/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java
index 49a20f1..199f2c0 100644
--- a/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java
+++ b/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java
@@ -1,12 +1,16 @@
 package cz.crcs.ectester.reader.output;
 
 import cz.crcs.ectester.common.output.BaseYAMLTestWriter;
+import cz.crcs.ectester.common.test.TestSuite;
 import cz.crcs.ectester.common.test.Testable;
 import cz.crcs.ectester.common.util.ByteUtil;
+import cz.crcs.ectester.reader.CardMngr;
 import cz.crcs.ectester.reader.command.Command;
 import cz.crcs.ectester.reader.response.Response;
+import cz.crcs.ectester.reader.test.CardTestSuite;
 import cz.crcs.ectester.reader.test.CommandTestable;
 
+import javax.smartcardio.CardException;
 import java.io.PrintStream;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -54,4 +58,33 @@ public class YAMLTestWriter extends BaseYAMLTestWriter {
         }
         return null;
     }
+
+    private Map<String, Object> cplcObject(CardMngr card) {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            CardMngr.CPLC cplc = card.getCPLC();
+            if (!cplc.values().isEmpty()) {
+                for (Map.Entry<CardMngr.CPLC.Field, byte[]> entry : cplc.values().entrySet()) {
+                    CardMngr.CPLC.Field field = entry.getKey();
+                    byte[] value = entry.getValue();
+                    result.put(field.name(), ByteUtil.bytesToHex(value, false));
+                }
+            }
+        } catch (CardException ignored) {
+        }
+        return result;
+    }
+
+    @Override
+    protected Map<String, Object> deviceObject(TestSuite suite) {
+        if (suite instanceof CardTestSuite) {
+            CardTestSuite cardSuite = (CardTestSuite) suite;
+            Map<String, Object> result = new HashMap<>();
+            result.put("type", "card");
+            result.put("cplc", cplcObject(cardSuite.getCard()));
+            result.put("ATR", ByteUtil.bytesToHex(cardSuite.getCard().getATR().getBytes(), false));
+            return result;
+        }
+        return null;
+    }
 }
-- 
cgit v1.2.3-70-g09d2