Split output to remove cross-dependency of reader and standalone.

4 files changed, 164 insertions, 1 deletions

diff --git a/src/cz/crcs/ectester/reader/ECTesterReader.java b/src/cz/crcs/ectester/reader/ECTesterReader.java
index 6fa7068..f566c9c 100644
--- a/src/cz/crcs/ectester/reader/ECTesterReader.java
+++ b/src/cz/crcs/ectester/reader/ECTesterReader.java
@@ -31,7 +31,10 @@ import cz.crcs.ectester.common.test.TestRunner;
 import cz.crcs.ectester.common.util.ByteUtil;
 import cz.crcs.ectester.data.EC_Store;
 import cz.crcs.ectester.reader.command.Command;
-import cz.crcs.ectester.reader.output.*;
+import cz.crcs.ectester.reader.output.ResponseWriter;
+import cz.crcs.ectester.reader.output.TextTestWriter;
+import cz.crcs.ectester.reader.output.XMLTestWriter;
+import cz.crcs.ectester.reader.output.YAMLTestWriter;
 import cz.crcs.ectester.reader.response.Response;
 import cz.crcs.ectester.reader.test.*;
 import javacard.security.KeyPair;
diff --git a/src/cz/crcs/ectester/reader/output/TextTestWriter.java b/src/cz/crcs/ectester/reader/output/TextTestWriter.java
new file mode 100644
index 0000000..dedf561
--- /dev/null
+++ b/src/cz/crcs/ectester/reader/output/TextTestWriter.java
@@ -0,0 +1,28 @@
+package cz.crcs.ectester.reader.output;
+
+import cz.crcs.ectester.common.output.BaseTextTestWriter;
+import cz.crcs.ectester.common.test.Testable;
+import cz.crcs.ectester.reader.test.CommandTestable;
+
+import java.io.PrintStream;
+
+/**
+ * @author Jan Jancar johny@neuromancer.sk
+ */
+public class TextTestWriter extends BaseTextTestWriter {
+    private ResponseWriter writer;
+
+    public TextTestWriter(PrintStream output) {
+        super(output);
+        this.writer = new ResponseWriter(output);
+    }
+
+    @Override
+    protected String testableString(Testable t) {
+        if (t instanceof CommandTestable) {
+            CommandTestable cmd = (CommandTestable) t;
+            return writer.responseSuffix(cmd.getResponse());
+        }
+        return "";
+    }
+}
diff --git a/src/cz/crcs/ectester/reader/output/XMLTestWriter.java b/src/cz/crcs/ectester/reader/output/XMLTestWriter.java
new file mode 100644
index 0000000..d88a64e
--- /dev/null
+++ b/src/cz/crcs/ectester/reader/output/XMLTestWriter.java
@@ -0,0 +1,75 @@
+package cz.crcs.ectester.reader.output;
+
+import cz.crcs.ectester.common.output.BaseXMLTestWriter;
+import cz.crcs.ectester.common.test.Testable;
+import cz.crcs.ectester.common.util.ByteUtil;
+import cz.crcs.ectester.reader.command.Command;
+import cz.crcs.ectester.reader.response.Response;
+import cz.crcs.ectester.reader.test.CommandTestable;
+import org.w3c.dom.Element;
+
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.OutputStream;
+
+/**
+ * @author Jan Jancar johny@neuromancer.sk
+ */
+public class XMLTestWriter extends BaseXMLTestWriter {
+    public XMLTestWriter(OutputStream output) throws ParserConfigurationException {
+        super(output);
+    }
+
+    private Element commandElement(Command c) {
+        Element commandElem = doc.createElement("command");
+
+        Element apdu = doc.createElement("apdu");
+        apdu.setTextContent(ByteUtil.bytesToHex(c.getAPDU().getBytes()));
+        commandElem.appendChild(apdu);
+
+        return commandElem;
+    }
+
+    private Element responseElement(Response r) {
+        Element responseElem = doc.createElement("response");
+        responseElem.setAttribute("successful", r.successful() ? "true" : "false");
+
+        Element apdu = doc.createElement("apdu");
+        apdu.setTextContent(ByteUtil.bytesToHex(r.getAPDU().getBytes()));
+        responseElem.appendChild(apdu);
+
+        Element naturalSW = doc.createElement("natural-sw");
+        naturalSW.setTextContent(String.valueOf(Short.toUnsignedInt(r.getNaturalSW())));
+        responseElem.appendChild(naturalSW);
+
+        Element sws = doc.createElement("sws");
+        for (int i = 0; i < r.getNumSW(); ++i) {
+            Element sw = doc.createElement("sw");
+            sw.setTextContent(String.valueOf(Short.toUnsignedInt(r.getSW(i))));
+            sws.appendChild(sw);
+        }
+        responseElem.appendChild(sws);
+
+        Element duration = doc.createElement("duration");
+        duration.setTextContent(String.valueOf(r.getDuration()));
+        responseElem.appendChild(duration);
+
+        Element description = doc.createElement("desc");
+        description.setTextContent(r.getDescription());
+        responseElem.appendChild(description);
+
+        return responseElem;
+    }
+
+    @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;
+    }
+}
\ 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
new file mode 100644
index 0000000..49a20f1
--- /dev/null
+++ b/src/cz/crcs/ectester/reader/output/YAMLTestWriter.java
@@ -0,0 +1,57 @@
+package cz.crcs.ectester.reader.output;
+
+import cz.crcs.ectester.common.output.BaseYAMLTestWriter;
+import cz.crcs.ectester.common.test.Testable;
+import cz.crcs.ectester.common.util.ByteUtil;
+import cz.crcs.ectester.reader.command.Command;
+import cz.crcs.ectester.reader.response.Response;
+import cz.crcs.ectester.reader.test.CommandTestable;
+
+import java.io.PrintStream;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Jan Jancar johny@neuromancer.sk
+ */
+public class YAMLTestWriter extends BaseYAMLTestWriter {
+    public YAMLTestWriter(PrintStream output) {
+        super(output);
+    }
+
+    private Map<String, Object> commandObject(Command c) {
+        Map<String, Object> commandObj = new HashMap<>();
+        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", 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) {
+            sws.add(Short.toUnsignedInt(r.getSW(i)));
+        }
+        responseObj.put("sws", sws);
+        responseObj.put("duration", r.getDuration());
+        responseObj.put("desc", r.getDescription());
+        return responseObj;
+    }
+
+    @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;
+        }
+        return null;
+    }
+}