Export CPLC data and card ATR in test suite outputs.

3 files changed, 100 insertions, 0 deletions

diff --git a/src/cz/crcs/ectester/reader/output/TextTestWriter.java b/src/cz/crcs/ectester/reader/output/TextTestWriter.java
index dedf561..eb52937 100644
--- a/src/cz/crcs/ectester/reader/output/TextTestWriter.java
+++ b/src/cz/crcs/ectester/reader/output/TextTestWriter.java
@@ -1,10 +1,16 @@
 package cz.crcs.ectester.reader.output;
 
 import cz.crcs.ectester.common.output.BaseTextTestWriter;
+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.test.CardTestSuite;
 import cz.crcs.ectester.reader.test.CommandTestable;
 
+import javax.smartcardio.CardException;
 import java.io.PrintStream;
+import java.util.Map;
 
 /**
  * @author Jan Jancar johny@neuromancer.sk
@@ -25,4 +31,27 @@ public class TextTestWriter extends BaseTextTestWriter {
         }
         return "";
     }
+
+    @Override
+    protected String deviceString(TestSuite suite) {
+        if (suite instanceof CardTestSuite) {
+            CardTestSuite cardSuite = (CardTestSuite) suite;
+            StringBuilder sb = new StringBuilder();
+            sb.append("═══ Card ATR: ").append(ByteUtil.bytesToHex(cardSuite.getCard().getATR().getBytes(), false)).append(System.lineSeparator());
+            try {
+                CardMngr.CPLC cplc = cardSuite.getCard().getCPLC();
+                if (!cplc.values().isEmpty()) {
+                    sb.append("═══ Card CPLC data:").append(System.lineSeparator());
+                    for (Map.Entry<CardMngr.CPLC.Field, byte[]> entry : cplc.values().entrySet()) {
+                        CardMngr.CPLC.Field field = entry.getKey();
+                        byte[] value = entry.getValue();
+                        sb.append("═══ ").append(field.name()).append(": ").append(CardMngr.mapCPLCField(field, value));
+                    }
+                }
+            } catch (CardException ignored) {
+            }
+            return sb.toString();
+        }
+        return "";
+    }
 }
diff --git a/src/cz/crcs/ectester/reader/output/XMLTestWriter.java b/src/cz/crcs/ectester/reader/output/XMLTestWriter.java
index d88a64e..356593e 100644
--- a/src/cz/crcs/ectester/reader/output/XMLTestWriter.java
+++ b/src/cz/crcs/ectester/reader/output/XMLTestWriter.java
@@ -1,15 +1,20 @@
 package cz.crcs.ectester.reader.output;
 
 import cz.crcs.ectester.common.output.BaseXMLTestWriter;
+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 org.w3c.dom.Element;
 
+import javax.smartcardio.CardException;
 import javax.xml.parsers.ParserConfigurationException;
 import java.io.OutputStream;
+import java.util.Map;
 
 /**
  * @author Jan Jancar johny@neuromancer.sk
@@ -72,4 +77,37 @@ public class XMLTestWriter extends BaseXMLTestWriter {
         }
         return null;
     }
+
+    private Element cplcElement(CardMngr card) {
+        Element result = doc.createElement("cplc");
+        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();
+                    Element keyVal = doc.createElement(field.name());
+                    keyVal.setTextContent(ByteUtil.bytesToHex(value, false));
+                    result.appendChild(keyVal);
+                }
+            }
+        } catch (CardException ignored) {
+        }
+        return result;
+    }
+
+    @Override
+    protected Element deviceElement(TestSuite suite) {
+        if (suite instanceof CardTestSuite) {
+            CardTestSuite cardSuite = (CardTestSuite) suite;
+            Element result = doc.createElement("device");
+            result.setAttribute("type", "card");
+            result.appendChild(cplcElement(cardSuite.getCard()));
+
+            Element atr = doc.createElement("ATR");
+            atr.setTextContent(ByteUtil.bytesToHex(cardSuite.getCard().getATR().getBytes(), false));
+            result.appendChild(atr);
+        }
+        return null;
+    }
 }
\ No newline at end of file
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;
+    }
 }