Introduce BaseTestable and Testable Metadata.

3 files changed, 6 insertions, 61 deletions

diff --git a/src/cz/crcs/ectester/standalone/test/KeyAgreementTestable.java b/src/cz/crcs/ectester/standalone/test/KeyAgreementTestable.java
index ef363c3..fedf519 100644
--- a/src/cz/crcs/ectester/standalone/test/KeyAgreementTestable.java
+++ b/src/cz/crcs/ectester/standalone/test/KeyAgreementTestable.java
@@ -1,5 +1,6 @@
 package cz.crcs.ectester.standalone.test;
 
+import cz.crcs.ectester.common.test.BaseTestable;
 import cz.crcs.ectester.common.test.TestException;
 import cz.crcs.ectester.common.test.Testable;
 
@@ -11,14 +12,11 @@ import java.security.interfaces.ECPublicKey;
 /**
  * @author Jan Jancar johny@neuromancer.sk
  */
-public class KeyAgreementTestable implements Testable {
+public class KeyAgreementTestable extends BaseTestable {
     private KeyAgreement ka;
     private ECPrivateKey privateKey;
     private ECPublicKey publicKey;
     private byte[] secret;
-    private boolean hasRun;
-    private boolean error = false;
-    private boolean ok;
 
     public KeyAgreementTestable(KeyAgreement ka, ECPrivateKey privateKey, ECPublicKey publicKey) {
         this.ka = ka;
@@ -34,11 +32,6 @@ public class KeyAgreementTestable implements Testable {
     }
 
     @Override
-    public boolean hasRun() {
-        return hasRun;
-    }
-
-    @Override
     public void run() throws TestException {
         try {
             ka.init(privateKey);
@@ -66,14 +59,4 @@ public class KeyAgreementTestable implements Testable {
         ok = true;
         hasRun = true;
     }
-
-    @Override
-    public boolean ok() {
-        return ok;
-    }
-
-    @Override
-    public boolean error() {
-        return error;
-    }
 }
diff --git a/src/cz/crcs/ectester/standalone/test/KeyGenerationTestable.java b/src/cz/crcs/ectester/standalone/test/KeyGenerationTestable.java
index 381ce70..5a891b7 100644
--- a/src/cz/crcs/ectester/standalone/test/KeyGenerationTestable.java
+++ b/src/cz/crcs/ectester/standalone/test/KeyGenerationTestable.java
@@ -1,22 +1,18 @@
 package cz.crcs.ectester.standalone.test;
 
+import cz.crcs.ectester.common.test.BaseTestable;
 import cz.crcs.ectester.common.test.TestException;
-import cz.crcs.ectester.common.test.Testable;
 
 import java.security.InvalidAlgorithmParameterException;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
 import java.security.spec.ECParameterSpec;
 
-public class KeyGenerationTestable implements Testable {
-
+public class KeyGenerationTestable extends BaseTestable {
     private KeyPair kp;
     private KeyPairGenerator kpg;
     private int keysize = 0;
     private ECParameterSpec spec = null;
-    private boolean hasRun;
-    private boolean error = false;
-    private boolean ok;
 
     public KeyGenerationTestable(KeyPairGenerator kpg) {
         this.kpg = kpg;
@@ -37,11 +33,6 @@ public class KeyGenerationTestable implements Testable {
     }
 
     @Override
-    public boolean hasRun() {
-        return hasRun;
-    }
-
-    @Override
     public void run() throws TestException {
         try {
             if (spec != null) {
@@ -58,14 +49,4 @@ public class KeyGenerationTestable implements Testable {
         hasRun = true;
         ok = true;
     }
-
-    @Override
-    public boolean ok() {
-        return ok;
-    }
-
-    @Override
-    public boolean error() {
-        return error;
-    }
 }
diff --git a/src/cz/crcs/ectester/standalone/test/SignatureTestable.java b/src/cz/crcs/ectester/standalone/test/SignatureTestable.java
index 5f58b4a..8b6815b 100644
--- a/src/cz/crcs/ectester/standalone/test/SignatureTestable.java
+++ b/src/cz/crcs/ectester/standalone/test/SignatureTestable.java
@@ -1,5 +1,6 @@
 package cz.crcs.ectester.standalone.test;
 
+import cz.crcs.ectester.common.test.BaseTestable;
 import cz.crcs.ectester.common.test.TestException;
 import cz.crcs.ectester.common.test.Testable;
 
@@ -9,8 +10,7 @@ import java.security.SignatureException;
 import java.security.interfaces.ECPrivateKey;
 import java.security.interfaces.ECPublicKey;
 
-public class SignatureTestable implements Testable {
-
+public class SignatureTestable extends BaseTestable {
     private Signature sig;
     private ECPrivateKey signKey;
     private ECPublicKey verifyKey;
@@ -18,10 +18,6 @@ public class SignatureTestable implements Testable {
     private byte[] signature;
     private boolean verified;
 
-    private boolean hasRun;
-    private boolean error;
-    private boolean ok;
-
     public SignatureTestable(Signature sig, ECPrivateKey signKey, ECPublicKey verifyKey, byte[] data) {
         this.sig = sig;
         this.signKey = signKey;
@@ -38,11 +34,6 @@ public class SignatureTestable implements Testable {
     }
 
     @Override
-    public boolean hasRun() {
-        return hasRun;
-    }
-
-    @Override
     public void run() throws TestException {
         try {
             sig.initSign(signKey);
@@ -89,14 +80,4 @@ public class SignatureTestable implements Testable {
         ok = true;
         hasRun = true;
     }
-
-    @Override
-    public boolean ok() {
-        return ok;
-    }
-
-    @Override
-    public boolean error() {
-        return error;
-    }
 }