Export CPLC data and card ATR in test suite outputs.

1 files changed, 29 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 "";
+    }
 }