1 files changed, 10 insertions, 3 deletions
diff --git a/src/cz/crcs/ectester/reader/output/TextTestWriter.java b/src/cz/crcs/ectester/reader/output/TextTestWriter.java
index eb52937..ad35012 100644
--- a/src/cz/crcs/ectester/reader/output/TextTestWriter.java
+++ b/src/cz/crcs/ectester/reader/output/TextTestWriter.java
@@ -1,10 +1,13 @@
 package cz.crcs.ectester.reader.output;
 
+import cz.crcs.ectester.common.cli.Colors;
 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.ECTesterReader;
+import cz.crcs.ectester.reader.response.Response;
 import cz.crcs.ectester.reader.test.CardTestSuite;
 import cz.crcs.ectester.reader.test.CommandTestable;
 
@@ -27,7 +30,10 @@ public class TextTestWriter extends BaseTextTestWriter {
     protected String testableString(Testable t) {
         if (t instanceof CommandTestable) {
             CommandTestable cmd = (CommandTestable) t;
-            return writer.responseSuffix(cmd.getResponse());
+            Response response = cmd.getResponse();
+            if (response != null) {
+                return writer.responseSuffix(response);
+            }
         }
         return "";
     }
@@ -37,11 +43,12 @@ public class TextTestWriter extends BaseTextTestWriter {
         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());
+            sb.append("═══ ").append(Colors.underline("ECTester version:")).append(" ").append(ECTesterReader.VERSION).append(ECTesterReader.GIT_COMMIT).append(System.lineSeparator());
+            sb.append("═══ ").append(Colors.underline("Card ATR:")).append(" ").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());
+                    sb.append("═══ ").append(Colors.underline("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();