Simplify test contract.

2 files changed, 15 insertions, 22 deletions

diff --git a/src/cz/crcs/ectester/reader/test/Test.java b/src/cz/crcs/ectester/reader/test/Test.java
index f873c19..1890e94 100644
--- a/src/cz/crcs/ectester/reader/test/Test.java
+++ b/src/cz/crcs/ectester/reader/test/Test.java
@@ -29,8 +29,6 @@ public abstract class Test {
         return hasRun;
     }
 
-    public abstract boolean ok();
-
     public abstract void run() throws CardException;
 
 
@@ -49,17 +47,20 @@ public abstract class Test {
      */
     public static class Simple extends Test {
         private BiFunction<Command, Response, Result> callback;
-        private Result expected;
         private Command command;
         private Response response;
 
         public Simple(Command command, Result expected) {
-            this.command = command;
-            this.expected = expected;
+            this(command, (cmd, resp) -> {
+                if (expected == Result.ANY)
+                    return Result.SUCCESS;
+                Result respResult = resp.successful() ? Result.SUCCESS : Result.FAILURE;
+                return respResult == expected ? Result.SUCCESS : Result.FAILURE;
+            });
         }
 
-        public Simple(Command command, Result expected, BiFunction<Command, Response, Result> callback) {
-            this(command, expected);
+        public Simple(Command command, BiFunction<Command, Response, Result> callback) {
+            this.command = command;
             this.callback = callback;
         }
 
@@ -71,17 +72,11 @@ public abstract class Test {
             return response;
         }
 
-        public Result getExpected() {
-            return expected;
-        }
-
-        @Override
-        public boolean ok() {
-            return result == expected || expected == Result.ANY;
-        }
-
         @Override
         public void run() throws CardException {
+            if (hasRun)
+                return;
+
             response = command.send();
             if (callback != null) {
                 result = callback.apply(command, response);
@@ -183,12 +178,10 @@ public abstract class Test {
         }
 
         @Override
-        public boolean ok() {
-            return result == Result.SUCCESS;
-        }
-
-        @Override
         public void run() throws CardException {
+            if (hasRun)
+                return;
+
             for (Test test : tests) {
                 test.run();
             }
diff --git a/src/cz/crcs/ectester/reader/test/TestVectorSuite.java b/src/cz/crcs/ectester/reader/test/TestVectorSuite.java
index 69f4ca3..2098ae3 100644
--- a/src/cz/crcs/ectester/reader/test/TestVectorSuite.java
+++ b/src/cz/crcs/ectester/reader/test/TestVectorSuite.java
@@ -63,7 +63,7 @@ public class TestVectorSuite extends TestSuite {
             //tests.add(new Test.Simple(new Command.Generate(cardManager, ECTesterApplet.KEYPAIR_BOTH), Test.Result.SUCCESS));
             testVector.add(new Test.Simple(new Command.Set(cardManager, ECTesterApplet.KEYPAIR_LOCAL, EC_Consts.CURVE_external, EC_Consts.PARAMETER_S, onekey.flatten(EC_Consts.PARAMETER_S)), Test.Result.SUCCESS));
             testVector.add(new Test.Simple(new Command.Set(cardManager, ECTesterApplet.KEYPAIR_REMOTE, EC_Consts.CURVE_external, EC_Consts.PARAMETER_W, otherkey.flatten(EC_Consts.PARAMETER_W)), Test.Result.SUCCESS));
-            testVector.add(new Test.Simple(new Command.ECDH(cardManager, ECTesterApplet.KEYPAIR_REMOTE, ECTesterApplet.KEYPAIR_LOCAL, ECTesterApplet.EXPORT_TRUE, EC_Consts.CORRUPTION_NONE, result.getKA()), Test.Result.SUCCESS, (command, response) -> {
+            testVector.add(new Test.Simple(new Command.ECDH(cardManager, ECTesterApplet.KEYPAIR_REMOTE, ECTesterApplet.KEYPAIR_LOCAL, ECTesterApplet.EXPORT_TRUE, EC_Consts.CORRUPTION_NONE, result.getKA()), (command, response) -> {
                 Response.ECDH dh = (Response.ECDH) response;
                 if (!dh.successful() || !dh.hasSecret())
                     return Test.Result.FAILURE;