Merge branch 'feature/standalone-lib-testing' into devel

1 files changed, 6 insertions, 6 deletions

diff --git a/src/cz/crcs/ectester/reader/test/DefaultSuite.java b/src/cz/crcs/ectester/reader/test/CardDefaultSuite.java
index fb8fdab..06818d4 100644
--- a/src/cz/crcs/ectester/reader/test/DefaultSuite.java
+++ b/src/cz/crcs/ectester/reader/test/CardDefaultSuite.java
@@ -15,15 +15,15 @@ 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.");
     }
 
     @Override
     public void setup(CardMngr cardManager) throws IOException {
-        tests.add(new SimpleTest(new Command.Support(cardManager), ExpectedValue.ANY));
+        tests.add(CommandTest.expect(new Command.Support(cardManager), ExpectedValue.ANY));
         if (cfg.namedCurve != null) {
             String desc = "Default tests over the " + cfg.namedCurve + " curve category.";
             if (cfg.primeField) {
@@ -59,11 +59,11 @@ public class DefaultSuite extends TestSuite {
     }
 
     private void defaultTests(CardMngr cardManager, short keyLength, byte keyType) throws IOException {
-        tests.add(new SimpleTest(new Command.Allocate(cardManager, ECTesterApplet.KEYPAIR_BOTH, keyLength, keyType), ExpectedValue.SUCCESS));
+        tests.add(CommandTest.expect(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 SimpleTest(curve, ExpectedValue.SUCCESS));
+            tests.add(CommandTest.expect(curve, ExpectedValue.SUCCESS));
         tests.add(defaultCurveTests(cardManager, ExpectedValue.SUCCESS, ExpectedValue.SUCCESS, ExpectedValue.ANY, ExpectedValue.SUCCESS, "Default tests."));
-        tests.add(new SimpleTest(new Command.Cleanup(cardManager), ExpectedValue.ANY));
+        tests.add(CommandTest.expect(new Command.Cleanup(cardManager), ExpectedValue.ANY));
     }
 }