From daaa7abd91ff8ae12e0b1835045489acbda0539f Mon Sep 17 00:00:00 2001
From: J08nY
Date: Sun, 5 Nov 2017 16:48:30 +0100
Subject: Implement Result.ExpectedValue to add more logic to test evaluation.

 - Introduces a new enum Result.ExpectedValue, which is used to
   signify what Test results are expected.
 - Changes the Result.Value enum to contain information about what
   was expected. It gains more values:
   - UXSUCCESS -> Unexpected success.
   - XFAILURE -> Expected failure.
   The values SUCCESS and XFAILURE are the OK, values.
 - Creates a hierarchy of evaluating Responses, Simple tests and
   Compoung tests.
   Simple test evaluates the OK property of the response object
   (using .successfull() method) and again exposes its OK property
   which depends on the tests ExpectedValue and the response
   success.
   Compound test evaluates the OK property of the Simple tests it
   contains (using the .ok() method) and again exposes its OK
   property which depends on the concrete Compound test variant,
   but involves some ExpectedValues and the success of the individual
   Simple tests it contains.
---
 src/cz/crcs/ectester/reader/test/DefaultSuite.java | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'src/cz/crcs/ectester/reader/test/DefaultSuite.java')

diff --git a/src/cz/crcs/ectester/reader/test/DefaultSuite.java b/src/cz/crcs/ectester/reader/test/DefaultSuite.java
index 8fea661..736b7c5 100644
--- a/src/cz/crcs/ectester/reader/test/DefaultSuite.java
+++ b/src/cz/crcs/ectester/reader/test/DefaultSuite.java
@@ -10,6 +10,8 @@ import javacard.security.KeyPair;
 
 import java.io.IOException;
 
+import static cz.crcs.ectester.reader.test.Result.ExpectedValue;
+
 /**
  * @author Jan Jancar johny@neuromancer.sk
  */
@@ -21,14 +23,14 @@ public class DefaultSuite extends TestSuite {
 
     @Override
     public void setup(CardMngr cardManager) throws IOException {
-        tests.add(new Test.Simple(new Command.Support(cardManager), Result.Value.ANY));
+        tests.add(new Test.Simple(new Command.Support(cardManager), ExpectedValue.ANY));
         if (cfg.namedCurve != null) {
             String desc = "Default tests over the " + cfg.namedCurve + " curve category.";
             if (cfg.primeField) {
-                tests.addAll(defaultCategoryTests(cardManager, cfg.namedCurve, KeyPair.ALG_EC_FP, Result.Value.SUCCESS, Result.Value.SUCCESS, Result.Value.SUCCESS, Result.Value.ANY, Result.Value.SUCCESS, desc));
+                tests.addAll(defaultCategoryTests(cardManager, cfg.namedCurve, KeyPair.ALG_EC_FP, ExpectedValue.SUCCESS, ExpectedValue.SUCCESS, ExpectedValue.SUCCESS, ExpectedValue.ANY, ExpectedValue.SUCCESS, desc));
             }
             if (cfg.binaryField) {
-                tests.addAll(defaultCategoryTests(cardManager, cfg.namedCurve, KeyPair.ALG_EC_F2M, Result.Value.SUCCESS, Result.Value.SUCCESS, Result.Value.SUCCESS, Result.Value.ANY, Result.Value.SUCCESS, desc));
+                tests.addAll(defaultCategoryTests(cardManager, cfg.namedCurve, KeyPair.ALG_EC_F2M, ExpectedValue.SUCCESS, ExpectedValue.SUCCESS, ExpectedValue.SUCCESS, ExpectedValue.ANY, ExpectedValue.SUCCESS, desc));
             }
         } else {
             if (cfg.all) {
@@ -57,11 +59,11 @@ public class DefaultSuite extends TestSuite {
     }
 
     private void defaultTests(CardMngr cardManager, short keyLength, byte keyType) throws IOException {
-        tests.add(new Test.Simple(new Command.Allocate(cardManager, ECTesterApplet.KEYPAIR_BOTH, keyLength, keyType), Result.Value.SUCCESS));
+        tests.add(new Test.Simple(new Command.Allocate(cardManager, ECTesterApplet.KEYPAIR_BOTH, keyLength, keyType), ExpectedValue.SUCCESS));
         Command curve = Command.prepareCurve(cardManager, dataStore, cfg, ECTesterApplet.KEYPAIR_BOTH, keyLength, keyType);
         if (curve != null)
-            tests.add(new Test.Simple(curve, Result.Value.SUCCESS));
-        tests.add(defaultCurveTests(cardManager, Result.Value.SUCCESS, Result.Value.SUCCESS, Result.Value.ANY, Result.Value.SUCCESS, "Default tests."));
-        tests.add(new Test.Simple(new Command.Cleanup(cardManager), Result.Value.ANY));
+            tests.add(new Test.Simple(curve, ExpectedValue.SUCCESS));
+        tests.add(defaultCurveTests(cardManager, ExpectedValue.SUCCESS, ExpectedValue.SUCCESS, ExpectedValue.ANY, ExpectedValue.SUCCESS, "Default tests."));
+        tests.add(new Test.Simple(new Command.Cleanup(cardManager), ExpectedValue.ANY));
     }
 }
-- 
cgit v1.2.3-70-g09d2