5 files changed, 35 insertions, 21 deletions

diff --git a/src/cz/crcs/ectester/reader/Util.java b/src/cz/crcs/ectester/reader/Util.java
index 840f4c5..4e1154b 100644
--- a/src/cz/crcs/ectester/reader/Util.java
+++ b/src/cz/crcs/ectester/reader/Util.java
@@ -287,10 +287,10 @@ public class Util {
 
     public static String getSWString(short sw) {
         if (sw == ISO7816.SW_NO_ERROR) {
-            return "OK\t(0x9000)";
+            return "OK   (0x9000)";
         } else {
             String str = getSW(sw);
-            return String.format("fail\t(%s, 0x%04x)", str, sw);
+            return String.format("fail (%s, 0x%04x)", str, sw);
         }
     }
 
diff --git a/src/cz/crcs/ectester/reader/output/ResponseWriter.java b/src/cz/crcs/ectester/reader/output/ResponseWriter.java
index 0f932e7..c357233 100644
--- a/src/cz/crcs/ectester/reader/output/ResponseWriter.java
+++ b/src/cz/crcs/ectester/reader/output/ResponseWriter.java
@@ -31,7 +31,7 @@ public class ResponseWriter {
 
     public void outputResponse(Response r) {
         String out = "";
-        out += String.format("%-70s", r.getDescription()) + " : ";
+        out += String.format("%-70s", r.getDescription()) + " ┃ ";
         out += responseSuffix(r);
         output.println(out);
         output.flush();
diff --git a/src/cz/crcs/ectester/reader/response/Response.java b/src/cz/crcs/ectester/reader/response/Response.java
index 42629b4..4abfd14 100644
--- a/src/cz/crcs/ectester/reader/response/Response.java
+++ b/src/cz/crcs/ectester/reader/response/Response.java
@@ -3,6 +3,7 @@ package cz.crcs.ectester.reader.response;
 import cz.crcs.ectester.applet.ECTesterApplet;
 import cz.crcs.ectester.applet.EC_Consts;
 import cz.crcs.ectester.reader.Util;
+import cz.crcs.ectester.reader.ec.EC_Data;
 import javacard.framework.ISO7816;
 import javacard.security.KeyPair;
 
@@ -18,7 +19,6 @@ public abstract class Response {
     private short[] sws;
     private int numSW = 0;
     private byte[][] params;
-    //TODO replace params with EC_Data?
     private boolean success = true;
     private boolean error = false;
 
@@ -27,7 +27,7 @@ public abstract class Response {
         this.time = time;
     }
 
-    public void parse(int numSW, int numParams) {
+    void parse(int numSW, int numParams) {
         this.numSW = numSW;
         this.sws = new short[numSW];
 
diff --git a/src/cz/crcs/ectester/reader/test/Result.java b/src/cz/crcs/ectester/reader/test/Result.java
index 9110929..82f0f32 100644
--- a/src/cz/crcs/ectester/reader/test/Result.java
+++ b/src/cz/crcs/ectester/reader/test/Result.java
@@ -29,11 +29,29 @@ public class Result {
         return value.ok();
     }
 
+    public boolean compareTo(Result other) {
+        if (other == null) {
+            return false;
+        }
+        return value == other.value;
+    }
+
+    public boolean compareTo(Value other) {
+        if (other == null) {
+            return false;
+        }
+        return value == other;
+    }
+
+    /**
+     *
+     */
     public enum Value {
         SUCCESS(true),
         FAILURE(false),
         UXSUCCESS(false),
-        XFAILURE(true);
+        XFAILURE(true),
+        ERROR(false);
 
         private boolean ok;
 
@@ -53,28 +71,24 @@ public class Result {
             return SUCCESS;
         }
 
+        public static Value fromExpected(ExpectedValue expected, boolean successful, boolean error) {
+            if (error) {
+                return ERROR;
+            }
+            return fromExpected(expected, successful);
+        }
+
         public boolean ok() {
             return ok;
         }
     }
 
+    /**
+     *
+     */
     public enum ExpectedValue {
         SUCCESS,
         FAILURE,
         ANY
     }
-
-    public boolean compareTo(Result other) {
-        if (other == null) {
-            return false;
-        }
-        return value == other.value;
-    }
-
-    public boolean compareTo(Value other) {
-        if (other == null) {
-            return false;
-        }
-        return value == other;
-    }
 }
diff --git a/src/cz/crcs/ectester/reader/test/Test.java b/src/cz/crcs/ectester/reader/test/Test.java
index 48280ed..022ad56 100644
--- a/src/cz/crcs/ectester/reader/test/Test.java
+++ b/src/cz/crcs/ectester/reader/test/Test.java
@@ -71,7 +71,7 @@ public abstract class Test {
 
         public Simple(Command command, ExpectedValue expected, String ok, String nok) {
             this(command, (cmd, resp) -> {
-                Value resultValue = Value.fromExpected(expected, resp.successful());
+                Value resultValue = Value.fromExpected(expected, resp.successful(), resp.error());
                 return new Result(resultValue, resultValue.ok() ? ok : nok);
             });
         }