Simplify test suites.

2 files changed, 12 insertions, 13 deletions

diff --git a/src/cz/crcs/ectester/standalone/test/StandaloneDefaultSuite.java b/src/cz/crcs/ectester/standalone/test/StandaloneDefaultSuite.java
index b24244e..42d2e54 100644
--- a/src/cz/crcs/ectester/standalone/test/StandaloneDefaultSuite.java
+++ b/src/cz/crcs/ectester/standalone/test/StandaloneDefaultSuite.java
@@ -2,6 +2,7 @@ package cz.crcs.ectester.standalone.test;
 
 import cz.crcs.ectester.common.cli.TreeCommandLine;
 import cz.crcs.ectester.common.ec.EC_Curve;
+import cz.crcs.ectester.common.output.TestWriter;
 import cz.crcs.ectester.common.test.Result;
 import cz.crcs.ectester.data.EC_Store;
 import cz.crcs.ectester.standalone.ECTesterStandalone;
@@ -11,7 +12,6 @@ import cz.crcs.ectester.standalone.consts.SignatureIdent;
 
 import javax.crypto.KeyAgreement;
 import java.security.KeyPairGenerator;
-import java.security.NoSuchAlgorithmException;
 import java.security.Signature;
 import java.security.spec.ECParameterSpec;
 
@@ -20,12 +20,12 @@ import java.security.spec.ECParameterSpec;
  */
 public class StandaloneDefaultSuite extends StandaloneTestSuite {
 
-    public StandaloneDefaultSuite(EC_Store dataStore, ECTesterStandalone.Config cfg, TreeCommandLine cli) {
-        super(dataStore, cfg, cli, "default", "The default test suite run basic support of ECDH and ECDSA.");
+    public StandaloneDefaultSuite(TestWriter writer, ECTesterStandalone.Config cfg, TreeCommandLine cli) {
+        super(writer, cfg, cli, "default", "The default test suite run basic support of ECDH and ECDSA.");
     }
 
     @Override
-    public void setup() throws NoSuchAlgorithmException {
+    protected void runTests() throws Exception {
         String kpgAlgo = cli.getOptionValue("test.kpg-type", "EC");
         String kaAlgo = cli.getOptionValue("test.ka-type");
         String sigAlgo = cli.getOptionValue("test.sig-type");
@@ -44,7 +44,7 @@ public class StandaloneDefaultSuite extends StandaloneTestSuite {
             kgtOther = new KeyGeneratorTestable(kpg, bits);
         } else if (cli.hasOption("test.named-curve")) {
             String curveName = cli.getOptionValue("test.named-curve");
-            EC_Curve curve = dataStore.getObject(EC_Curve.class, curveName);
+            EC_Curve curve = EC_Store.getInstance().getObject(EC_Curve.class, curveName);
             if (curve == null) {
                 System.err.println("Curve not found: " + curveName);
                 return;
@@ -57,19 +57,19 @@ public class StandaloneDefaultSuite extends StandaloneTestSuite {
             kgtOther = new KeyGeneratorTestable(kpg);
         }
 
-        run.add(KeyGeneratorTest.expect(kgtOne, Result.ExpectedValue.SUCCESS));
-        run.add(KeyGeneratorTest.expect(kgtOther, Result.ExpectedValue.SUCCESS));
+        doTest(KeyGeneratorTest.expect(kgtOne, Result.ExpectedValue.SUCCESS));
+        doTest(KeyGeneratorTest.expect(kgtOther, Result.ExpectedValue.SUCCESS));
 
         for (KeyAgreementIdent kaIdent : cfg.selected.getKAs()) {
             if (kaAlgo == null || kaIdent.contains(kaAlgo)) {
                 KeyAgreement ka = kaIdent.getInstance(cfg.selected.getProvider());
-                run.add(KeyAgreementTest.expect(new KeyAgreementTestable(ka, kgtOne, kgtOther, spec), Result.ExpectedValue.SUCCESS));
+                doTest(KeyAgreementTest.expect(new KeyAgreementTestable(ka, kgtOne, kgtOther, spec), Result.ExpectedValue.SUCCESS));
             }
         }
         for (SignatureIdent sigIdent : cfg.selected.getSigs()) {
             if (sigAlgo == null || sigIdent.contains(sigAlgo)) {
                 Signature sig = sigIdent.getInstance(cfg.selected.getProvider());
-                run.add(SignatureTest.expect(new SignatureTestable(sig, kgtOne, null), Result.ExpectedValue.SUCCESS));
+                doTest(SignatureTest.expect(new SignatureTestable(sig, kgtOne, null), Result.ExpectedValue.SUCCESS));
             }
         }
     }
diff --git a/src/cz/crcs/ectester/standalone/test/StandaloneTestSuite.java b/src/cz/crcs/ectester/standalone/test/StandaloneTestSuite.java
index 5682cd5..ad404c8 100644
--- a/src/cz/crcs/ectester/standalone/test/StandaloneTestSuite.java
+++ b/src/cz/crcs/ectester/standalone/test/StandaloneTestSuite.java
@@ -1,6 +1,7 @@
 package cz.crcs.ectester.standalone.test;
 
 import cz.crcs.ectester.common.cli.TreeCommandLine;
+import cz.crcs.ectester.common.output.TestWriter;
 import cz.crcs.ectester.common.test.TestSuite;
 import cz.crcs.ectester.data.EC_Store;
 import cz.crcs.ectester.standalone.ECTesterStandalone;
@@ -14,11 +15,9 @@ public abstract class StandaloneTestSuite extends TestSuite {
     TreeCommandLine cli;
     ECTesterStandalone.Config cfg;
 
-    public StandaloneTestSuite(EC_Store dataStore, ECTesterStandalone.Config cfg, TreeCommandLine cli, String name, String description) {
-        super(dataStore, name, description);
+    public StandaloneTestSuite(TestWriter writer, ECTesterStandalone.Config cfg, TreeCommandLine cli, String name, String description) {
+        super(writer, name, description);
         this.cfg = cfg;
         this.cli = cli;
     }
-
-    public abstract void setup() throws NoSuchAlgorithmException;
 }