Specialize test suites in reader package to classes.

1 files changed, 4 insertions, 21 deletions

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