Merge branch 'devel'v0.2.0

7 files changed, 147 insertions, 225 deletions

diff --git a/src/cz/crcs/ectester/reader/output/OutputLogger.java b/src/cz/crcs/ectester/common/output/OutputLogger.java
index bf47a1f..09b8f73 100644
--- a/src/cz/crcs/ectester/reader/output/OutputLogger.java
+++ b/src/cz/crcs/ectester/common/output/OutputLogger.java
@@ -1,4 +1,4 @@
-package cz.crcs.ectester.reader.output;
+package cz.crcs.ectester.common.output;
 
 import java.io.*;
 import java.util.LinkedList;
diff --git a/src/cz/crcs/ectester/reader/output/TeeOutputStream.java b/src/cz/crcs/ectester/common/output/TeeOutputStream.java
index 2a1af99..2401fce 100644
--- a/src/cz/crcs/ectester/reader/output/TeeOutputStream.java
+++ b/src/cz/crcs/ectester/common/output/TeeOutputStream.java
@@ -1,4 +1,4 @@
-package cz.crcs.ectester.reader.output;
+package cz.crcs.ectester.common.output;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/src/cz/crcs/ectester/reader/output/TestWriter.java b/src/cz/crcs/ectester/common/output/TestWriter.java
index 74c76fb..0ecfd5a 100644
--- a/src/cz/crcs/ectester/reader/output/TestWriter.java
+++ b/src/cz/crcs/ectester/common/output/TestWriter.java
@@ -1,7 +1,7 @@
-package cz.crcs.ectester.reader.output;
+package cz.crcs.ectester.common.output;
 
-import cz.crcs.ectester.reader.test.Test;
-import cz.crcs.ectester.reader.test.TestSuite;
+import cz.crcs.ectester.common.test.Test;
+import cz.crcs.ectester.common.test.TestSuite;
 
 /**
  * @author Jan Jancar johny@neuromancer.sk
diff --git a/src/cz/crcs/ectester/reader/output/ResponseWriter.java b/src/cz/crcs/ectester/reader/output/ResponseWriter.java
index c357233..85bf79a 100644
--- a/src/cz/crcs/ectester/reader/output/ResponseWriter.java
+++ b/src/cz/crcs/ectester/reader/output/ResponseWriter.java
@@ -1,6 +1,6 @@
 package cz.crcs.ectester.reader.output;
 
-import cz.crcs.ectester.reader.Util;
+import cz.crcs.ectester.common.util.CardUtil;
 import cz.crcs.ectester.reader.response.Response;
 
 import java.io.PrintStream;
@@ -20,20 +20,24 @@ public class ResponseWriter {
         for (int j = 0; j < r.getNumSW(); ++j) {
             short sw = r.getSW(j);
             if (sw != 0) {
-                suffix.append(" ").append(Util.getSWString(sw));
+                suffix.append(" ").append(CardUtil.getSWString(sw));
             }
         }
         if (suffix.length() == 0) {
-            suffix.append(" [").append(Util.getSW(r.getNaturalSW())).append("]");
+            suffix.append(" [").append(CardUtil.getSW(r.getNaturalSW())).append(String.format(" 0x%04x", r.getNaturalSW())).append("]");
         }
         return String.format("%4d ms ┃ %s", r.getDuration() / 1000000, suffix);
     }
 
-    public void outputResponse(Response r) {
+    public String responseString(Response r) {
         String out = "";
         out += String.format("%-70s", r.getDescription()) + " ┃ ";
         out += responseSuffix(r);
-        output.println(out);
+        return out;
+    }
+
+    public void outputResponse(Response r) {
+        output.println(responseString(r));
         output.flush();
     }
 }
diff --git a/src/cz/crcs/ectester/reader/output/TextTestWriter.java b/src/cz/crcs/ectester/reader/output/TextTestWriter.java
index bcebcd5..eb52937 100644
--- a/src/cz/crcs/ectester/reader/output/TextTestWriter.java
+++ b/src/cz/crcs/ectester/reader/output/TextTestWriter.java
@@ -1,85 +1,57 @@
 package cz.crcs.ectester.reader.output;
 
-import cz.crcs.ectester.reader.test.Test;
-import cz.crcs.ectester.reader.test.TestSuite;
+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
  */
-public class TextTestWriter implements TestWriter {
-    private PrintStream output;
-    private ResponseWriter respWriter;
-
-    public static int BASE_WIDTH = 76;
+public class TextTestWriter extends BaseTextTestWriter {
+    private ResponseWriter writer;
 
     public TextTestWriter(PrintStream output) {
-        this.output = output;
-        this.respWriter = new ResponseWriter(output);
+        super(output);
+        this.writer = new ResponseWriter(output);
     }
 
     @Override
-    public void begin(TestSuite suite) {
-        output.println("=== Running test suite: " + suite.getName() + " ===");
-        output.println("=== " + suite.getDescription());
-    }
-
-    private String testString(Test t, int offset) {
-        if (!t.hasRun()) {
-            return null;
+    protected String testableString(Testable t) {
+        if (t instanceof CommandTestable) {
+            CommandTestable cmd = (CommandTestable) t;
+            return writer.responseSuffix(cmd.getResponse());
         }
+        return "";
+    }
 
-        StringBuilder out = new StringBuilder();
-        if (t instanceof Test.Simple) {
-            Test.Simple test = (Test.Simple) t;
-            out.append(test.ok() ? "OK  " : "NOK ");
-            out.append("━ ");
-            int width = BASE_WIDTH - (offset + out.length());
-            String widthSpec = "%-" + String.valueOf(width) + "s";
-            out.append(String.format(widthSpec, t.getDescription()));
-            out.append(" ┃ ");
-            out.append(String.format("%-9s", test.getResultValue().name()));
-            out.append(" ┃ ");
-            out.append(respWriter.responseSuffix(test.getResponse()));
-        } else {
-            Test.Compound test = (Test.Compound) t;
-            out.append(test.ok() ? "OK  " : "NOK ");
-            out.append("┳ ");
-            int width = BASE_WIDTH - (offset + out.length());
-            String widthSpec = "%-" + String.valueOf(width) + "s";
-            out.append(String.format(widthSpec, t.getDescription()));
-            out.append(" ┃ ");
-            out.append(String.format("%-9s", test.getResultValue().name()));
-            out.append(" ┃ ");
-            out.append(test.getResultCause());
-            out.append(System.lineSeparator());
-            Test[] tests = test.getTests();
-            for (int i = 0; i < tests.length; ++i) {
-                if (i == tests.length - 1) {
-                    out.append("    ┗ ");
-                } else {
-                    out.append("    ┣ ");
-                }
-                out.append(testString(tests[i], offset + 6));
-                if (i != tests.length - 1) {
-                    out.append(System.lineSeparator());
+    @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 out.toString();
-    }
-
-    @Override
-    public void outputTest(Test t) {
-        if (!t.hasRun())
-            return;
-        output.println(testString(t, 0));
-        output.flush();
-    }
-
-    @Override
-    public void end() {
+        return "";
     }
 }
diff --git a/src/cz/crcs/ectester/reader/output/XMLTestWriter.java b/src/cz/crcs/ectester/reader/output/XMLTestWriter.java
index beb758c..d3674e8 100644
--- a/src/cz/crcs/ectester/reader/output/XMLTestWriter.java
+++ b/src/cz/crcs/ectester/reader/output/XMLTestWriter.java
@@ -1,55 +1,34 @@
 package cz.crcs.ectester.reader.output;
 
-import cz.crcs.ectester.reader.Util;
+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.Test;
-import cz.crcs.ectester.reader.test.TestSuite;
-import org.w3c.dom.Document;
+import cz.crcs.ectester.reader.test.CardTestSuite;
+import cz.crcs.ectester.reader.test.CommandTestable;
 import org.w3c.dom.Element;
-import org.w3c.dom.Node;
 
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
+import javax.smartcardio.CardException;
 import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
 import java.io.OutputStream;
+import java.util.Map;
 
 /**
  * @author Jan Jancar johny@neuromancer.sk
  */
-public class XMLTestWriter implements TestWriter {
-    private OutputStream output;
-    private DocumentBuilder db;
-    private Document doc;
-    private Node root;
-
+public class XMLTestWriter extends BaseXMLTestWriter {
     public XMLTestWriter(OutputStream output) throws ParserConfigurationException {
-        this.output = output;
-        this.db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-    }
-
-    @Override
-    public void begin(TestSuite suite) {
-        doc = db.newDocument();
-        Element rootElem = doc.createElement("testSuite");
-        rootElem.setAttribute("name", suite.getName());
-        rootElem.setAttribute("desc", suite.getDescription());
-
-        root = rootElem;
-        doc.appendChild(root);
+        super(output);
     }
 
     private Element commandElement(Command c) {
         Element commandElem = doc.createElement("command");
 
         Element apdu = doc.createElement("apdu");
-        apdu.setTextContent(Util.bytesToHex(c.getAPDU().getBytes()));
+        apdu.setTextContent(ByteUtil.bytesToHex(c.getAPDU().getBytes()));
         commandElem.appendChild(apdu);
 
         return commandElem;
@@ -60,7 +39,7 @@ public class XMLTestWriter implements TestWriter {
         responseElem.setAttribute("successful", r.successful() ? "true" : "false");
 
         Element apdu = doc.createElement("apdu");
-        apdu.setTextContent(Util.bytesToHex(r.getAPDU().getBytes()));
+        apdu.setTextContent(ByteUtil.bytesToHex(r.getAPDU().getBytes()));
         responseElem.appendChild(apdu);
 
         Element naturalSW = doc.createElement("natural-sw");
@@ -86,60 +65,50 @@ public class XMLTestWriter implements TestWriter {
         return responseElem;
     }
 
-    private Element testElement(Test t) {
-        Element testElem = doc.createElement("test");
+    @Override
+    protected Element testableElement(Testable t) {
+        if (t instanceof CommandTestable) {
+            CommandTestable cmd = (CommandTestable) t;
+            Element result = doc.createElement("test");
+            result.setAttribute("type", "command");
+            result.appendChild(commandElement(cmd.getCommand()));
+            result.appendChild(responseElement(cmd.getResponse()));
+            return result;
+        }
+        return null;
+    }
 
-        if (t instanceof Test.Simple) {
-            Test.Simple test = (Test.Simple) t;
-            testElem.setAttribute("type", "simple");
-            testElem.appendChild(commandElement(test.getCommand()));
-            testElem.appendChild(responseElement(test.getResponse()));
-        } else if (t instanceof Test.Compound) {
-            Test.Compound test = (Test.Compound) t;
-            testElem.setAttribute("type", "compound");
-            for (Test innerTest : test.getTests()) {
-                testElem.appendChild(testElement(innerTest));
+    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) {
         }
-
-        Element description = doc.createElement("desc");
-        description.setTextContent(t.getDescription());
-        testElem.appendChild(description);
-
-        Element result = doc.createElement("result");
-        Element ok = doc.createElement("ok");
-        ok.setTextContent(String.valueOf(t.ok()));
-        Element value = doc.createElement("value");
-        value.setTextContent(t.getResultValue().name());
-        Element cause = doc.createElement("cause");
-        cause.setTextContent(t.getResultCause());
-        result.appendChild(ok);
-        result.appendChild(value);
-        result.appendChild(cause);
-        testElem.appendChild(result);
-
-        return testElem;
+        return result;
     }
 
     @Override
-    public void outputTest(Test t) {
-        if (!t.hasRun())
-            return;
-        root.appendChild(testElement(t));
-    }
+    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()));
 
-    @Override
-    public void end() {
-        try {
-            DOMSource domSource = new DOMSource(doc);
-            StreamResult result = new StreamResult(output);
-            TransformerFactory tf = TransformerFactory.newInstance();
-            Transformer transformer = tf.newTransformer();
-            transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-            transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
-            transformer.transform(domSource, result);
-        } catch (TransformerException e) {
-            e.printStackTrace();
+            Element atr = doc.createElement("ATR");
+            atr.setTextContent(ByteUtil.bytesToHex(cardSuite.getCard().getATR().getBytes(), false));
+            result.appendChild(atr);
+            return result;
         }
+        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 3b2b72d..199f2c0 100644
--- a/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java
+++ b/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java
@@ -1,13 +1,16 @@
 package cz.crcs.ectester.reader.output;
 
-import cz.crcs.ectester.reader.Util;
+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.Test;
-import cz.crcs.ectester.reader.test.TestSuite;
-import org.yaml.snakeyaml.DumperOptions;
-import org.yaml.snakeyaml.Yaml;
+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;
@@ -17,39 +20,21 @@ import java.util.Map;
 /**
  * @author Jan Jancar johny@neuromancer.sk
  */
-public class YAMLTestWriter implements TestWriter {
-    private PrintStream output;
-    private Map<String, Object> testRun;
-    private Map<String, String> testSuite;
-    private List<Object> tests;
-
+public class YAMLTestWriter extends BaseYAMLTestWriter {
     public YAMLTestWriter(PrintStream output) {
-        this.output = output;
-    }
-
-    @Override
-    public void begin(TestSuite suite) {
-        output.println("---");
-        testRun = new HashMap<>();
-        testSuite = new HashMap<>();
-        tests = new LinkedList<>();
-        testSuite.put("name", suite.getName());
-        testSuite.put("desc", suite.getDescription());
-
-        testRun.put("suite", testSuite);
-        testRun.put("tests", tests);
+        super(output);
     }
 
     private Map<String, Object> commandObject(Command c) {
         Map<String, Object> commandObj = new HashMap<>();
-        commandObj.put("apdu", Util.bytesToHex(c.getAPDU().getBytes()));
+        commandObj.put("apdu", ByteUtil.bytesToHex(c.getAPDU().getBytes()));
         return commandObj;
     }
 
     private Map<String, Object> responseObject(Response r) {
         Map<String, Object> responseObj = new HashMap<>();
         responseObj.put("successful", r.successful());
-        responseObj.put("apdu", Util.bytesToHex(r.getAPDU().getBytes()));
+        responseObj.put("apdu", ByteUtil.bytesToHex(r.getAPDU().getBytes()));
         responseObj.put("natural_sw", Short.toUnsignedInt(r.getNaturalSW()));
         List<Integer> sws = new LinkedList<>();
         for (int i = 0; i < r.getNumSW(); ++i) {
@@ -61,53 +46,45 @@ public class YAMLTestWriter implements TestWriter {
         return responseObj;
     }
 
-    private Map<String, Object> testObject(Test t) {
-        Map<String, Object> testObj = new HashMap<>();
-
-        if (t instanceof Test.Simple) {
-            Test.Simple test = (Test.Simple) t;
-            testObj.put("type", "simple");
-            testObj.put("command", commandObject(test.getCommand()));
-            testObj.put("response", responseObject(test.getResponse()));
-        } else if (t instanceof Test.Compound) {
-            Test.Compound test = (Test.Compound) t;
-            testObj.put("type", "compound");
-            List<Map<String, Object>> tests = new LinkedList<>();
-            for (Test innerTest : test.getTests()) {
-                tests.add(testObject(innerTest));
-            }
-            testObj.put("tests", tests);
+    @Override
+    protected Map<String, Object> testableObject(Testable t) {
+        if (t instanceof CommandTestable) {
+            CommandTestable cmd = (CommandTestable) t;
+            Map<String, Object> result = new HashMap<>();
+            result.put("type", "command");
+            result.put("command", commandObject(cmd.getCommand()));
+            result.put("response", responseObject(cmd.getResponse()));
+            return result;
         }
-
-        testObj.put("desc", t.getDescription());
-        Map<String, Object> result = new HashMap<>();
-        result.put("ok", t.ok());
-        result.put("value", t.getResultValue().name());
-        result.put("cause", t.getResultCause());
-        testObj.put("result", result);
-
-        return testObj;
+        return null;
     }
 
-    @Override
-    public void outputTest(Test t) {
-        if (!t.hasRun())
-            return;
-        tests.add(testObject(t));
+    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
-    public void end() {
-        DumperOptions options = new DumperOptions();
-        options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
-        options.setPrettyFlow(true);
-        Yaml yaml = new Yaml(options);
-
-        Map<String, Object> result = new HashMap<>();
-        result.put("testRun", testRun);
-        String out = yaml.dump(result);
-
-        output.println(out);
-        output.println("---");
+    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;
     }
 }