Split ResponseWriter into separate class, introduce TestRunner.

1 files changed, 4 insertions, 5 deletions

diff --git a/src/cz/crcs/ectester/reader/test/WrongCurvesSuite.java b/src/cz/crcs/ectester/reader/test/WrongCurvesSuite.java
index 3346b9f..95bbe1e 100644
--- a/src/cz/crcs/ectester/reader/test/WrongCurvesSuite.java
+++ b/src/cz/crcs/ectester/reader/test/WrongCurvesSuite.java
@@ -3,7 +3,7 @@ package cz.crcs.ectester.reader.test;
 import cz.crcs.ectester.data.EC_Store;
 import cz.crcs.ectester.reader.CardMngr;
 import cz.crcs.ectester.reader.ECTester;
-import cz.crcs.ectester.reader.output.OutputWriter;
+import cz.crcs.ectester.reader.output.TestWriter;
 import javacard.security.KeyPair;
 
 import javax.smartcardio.CardException;
@@ -16,12 +16,12 @@ import java.util.List;
  */
 public class WrongCurvesSuite extends TestSuite {
 
-    public WrongCurvesSuite(EC_Store dataStore, ECTester.Config cfg, OutputWriter writer) {
-        super(dataStore, cfg, writer, "wrong");
+    public WrongCurvesSuite(EC_Store dataStore, ECTester.Config cfg) {
+        super(dataStore, cfg, "wrong");
     }
 
     @Override
-    public List<Test> run(CardMngr cardManager) throws CardException, IOException {
+    public void setup(CardMngr cardManager) throws IOException {
         /* Just do the default tests on the wrong curves.
          * These should generally fail, the curves aren't curves.
          */
@@ -31,6 +31,5 @@ public class WrongCurvesSuite extends TestSuite {
         if (cfg.binaryField) {
             tests.addAll(defaultCategoryTests(cardManager, cfg.testSuite, KeyPair.ALG_EC_F2M, Test.Result.FAILURE, Test.Result.FAILURE, Test.Result.FAILURE, Test.Result.FAILURE));
         }
-        return super.run(cardManager);
     }
 }