Specialize test suites in reader package to classes.

7 files changed, 14 insertions, 60 deletions

diff --git a/src/cz/crcs/ectester/reader/test/CompositeCurvesSuite.java b/src/cz/crcs/ectester/reader/test/CardCompositeCurvesSuite.java
index 8a02381..930a0d0 100644
--- a/src/cz/crcs/ectester/reader/test/CompositeCurvesSuite.java
+++ b/src/cz/crcs/ectester/reader/test/CardCompositeCurvesSuite.java
@@ -17,9 +17,9 @@ import static cz.crcs.ectester.common.test.Result.ExpectedValue;
 /**
  * @author Jan Jancar johny@neuromancer.sk
  */
-public class CompositeCurvesSuite extends TestSuite {
+public class CardCompositeCurvesSuite extends CardTestSuite {
 
-    public CompositeCurvesSuite(EC_Store dataStore, ECTesterReader.Config cfg) {
+    public CardCompositeCurvesSuite(EC_Store dataStore, ECTesterReader.Config cfg) {
         super(dataStore, cfg, "composite", "The composite suite tests ECDH over curves with composite order. This should generally fail, as using such a curve is unsafe.");
     }
 
diff --git a/src/cz/crcs/ectester/reader/test/DefaultSuite.java b/src/cz/crcs/ectester/reader/test/CardDefaultSuite.java
index 881480c..06818d4 100644
--- a/src/cz/crcs/ectester/reader/test/DefaultSuite.java
+++ b/src/cz/crcs/ectester/reader/test/CardDefaultSuite.java
@@ -15,9 +15,9 @@ import static cz.crcs.ectester.common.test.Result.ExpectedValue;
 /**
  * @author Jan Jancar johny@neuromancer.sk
  */
-public class DefaultSuite extends TestSuite {
+public class CardDefaultSuite extends CardTestSuite {
 
-    public DefaultSuite(EC_Store dataStore, ECTesterReader.Config cfg) {
+    public CardDefaultSuite(EC_Store dataStore, ECTesterReader.Config cfg) {
         super(dataStore, cfg, "default", "The default test suite tests basic support of ECDH and ECDSA.");
     }
 
diff --git a/src/cz/crcs/ectester/reader/test/InvalidCurvesSuite.java b/src/cz/crcs/ectester/reader/test/CardInvalidCurvesSuite.java
index 96e4ca2..e4e55c9 100644
--- a/src/cz/crcs/ectester/reader/test/InvalidCurvesSuite.java
+++ b/src/cz/crcs/ectester/reader/test/CardInvalidCurvesSuite.java
@@ -23,9 +23,9 @@ import static cz.crcs.ectester.common.test.Result.ExpectedValue;
 /**
  * @author Jan Jancar johny@neuromancer.sk
  */
-public class InvalidCurvesSuite extends TestSuite {
+public class CardInvalidCurvesSuite extends CardTestSuite {
 
-    public InvalidCurvesSuite(EC_Store dataStore, ECTesterReader.Config cfg) {
+    public CardInvalidCurvesSuite(EC_Store dataStore, ECTesterReader.Config cfg) {
         super(dataStore, cfg, "invalid", "The invalid curve suite tests whether the card rejects points outside of the curve during ECDH.");
     }
 
diff --git a/src/cz/crcs/ectester/reader/test/TestSuite.java b/src/cz/crcs/ectester/reader/test/CardTestSuite.java
index e722960..e3cc155 100644
--- a/src/cz/crcs/ectester/reader/test/TestSuite.java
+++ b/src/cz/crcs/ectester/reader/test/CardTestSuite.java
@@ -6,6 +6,7 @@ import cz.crcs.ectester.common.ec.EC_Curve;
 import cz.crcs.ectester.common.test.CompoundTest;
 import cz.crcs.ectester.common.test.Result;
 import cz.crcs.ectester.common.test.Test;
+import cz.crcs.ectester.common.test.TestSuite;
 import cz.crcs.ectester.data.EC_Store;
 import cz.crcs.ectester.reader.CardMngr;
 import cz.crcs.ectester.reader.ECTesterReader;
@@ -24,34 +25,16 @@ import static cz.crcs.ectester.common.test.Result.Value;
 /**
  * @author Jan Jancar johny@neuromancer.sk
  */
-public abstract class TestSuite {
-    EC_Store dataStore;
+public abstract class CardTestSuite extends TestSuite {
     ECTesterReader.Config cfg;
-    String name;
-    String description;
-    List<Test> tests = new LinkedList<>();
 
-    TestSuite(EC_Store dataStore, ECTesterReader.Config cfg, String name, String description) {
-        this.dataStore = dataStore;
+    CardTestSuite(EC_Store dataStore, ECTesterReader.Config cfg, String name, String description) {
+        super(dataStore, name, description);
         this.cfg = cfg;
-        this.name = name;
-        this.description = description;
     }
 
     public abstract void setup(CardMngr cardManager) throws IOException;
 
-    public List<Test> getTests() {
-        return Collections.unmodifiableList(tests);
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
     /**
      * @param cardManager          cardManager to send APDU through
      * @param generateExpected     expected result of the Generate command
diff --git a/src/cz/crcs/ectester/reader/test/TestVectorSuite.java b/src/cz/crcs/ectester/reader/test/CardTestVectorSuite.java
index c89cfa6..72e3cce 100644
--- a/src/cz/crcs/ectester/reader/test/TestVectorSuite.java
+++ b/src/cz/crcs/ectester/reader/test/CardTestVectorSuite.java
@@ -26,9 +26,9 @@ import static cz.crcs.ectester.common.test.Result.Value;
 /**
  * @author Jan Jancar johny@neuromancer.sk
  */
-public class TestVectorSuite extends TestSuite {
+public class CardTestVectorSuite extends CardTestSuite {
 
-    public TestVectorSuite(EC_Store dataStore, ECTesterReader.Config cfg) {
+    public CardTestVectorSuite(EC_Store dataStore, ECTesterReader.Config cfg) {
         super(dataStore, cfg, "test", "The test-vectors suite contains a collection of test vectors which test basic ECDH correctness.");
     }
 
diff --git a/src/cz/crcs/ectester/reader/test/WrongCurvesSuite.java b/src/cz/crcs/ectester/reader/test/CardWrongCurvesSuite.java
index 76da718..4c529da 100644
--- a/src/cz/crcs/ectester/reader/test/WrongCurvesSuite.java
+++ b/src/cz/crcs/ectester/reader/test/CardWrongCurvesSuite.java
@@ -12,9 +12,9 @@ import static cz.crcs.ectester.common.test.Result.ExpectedValue;
 /**
  * @author Jan Jancar johny@neuromancer.sk
  */
-public class WrongCurvesSuite extends TestSuite {
+public class CardWrongCurvesSuite extends CardTestSuite {
 
-    public WrongCurvesSuite(EC_Store dataStore, ECTesterReader.Config cfg) {
+    public CardWrongCurvesSuite(EC_Store dataStore, ECTesterReader.Config cfg) {
         super(dataStore, cfg, "wrong", "The wrong curve suite tests whether the card rejects domain parameters which are not curves.");
     }
 
diff --git a/src/cz/crcs/ectester/reader/test/TestRunner.java b/src/cz/crcs/ectester/reader/test/TestRunner.java
deleted file mode 100644
index e581aaa..0000000
--- a/src/cz/crcs/ectester/reader/test/TestRunner.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package cz.crcs.ectester.reader.test;
-
-import cz.crcs.ectester.common.test.Test;
-import cz.crcs.ectester.common.test.TestException;
-import cz.crcs.ectester.common.output.TestWriter;
-
-/**
- * @author Jan Jancar johny@neuromancer.sk
- */
-public class TestRunner {
-    private TestSuite suite;
-    private TestWriter writer;
-
-    public TestRunner(TestSuite suite, TestWriter writer) {
-        this.suite = suite;
-        this.writer = writer;
-    }
-
-    public void run() throws TestException {
-        writer.begin(suite);
-        for (Test t : suite.getTests()) {
-            if (!t.hasRun()) {
-                t.run();
-                writer.outputTest(t);
-            }
-        }
-        writer.end();
-    }
-}