Handle exceptions in standalone testables better.

1 files changed, 51 insertions, 40 deletions

diff --git a/src/cz/crcs/ectester/standalone/test/SignatureTestable.java b/src/cz/crcs/ectester/standalone/test/SignatureTestable.java
index c77e9c5..6bc9b30 100644
--- a/src/cz/crcs/ectester/standalone/test/SignatureTestable.java
+++ b/src/cz/crcs/ectester/standalone/test/SignatureTestable.java
@@ -57,54 +57,65 @@ public class SignatureTestable extends BaseTestable {
 
     @Override
     public void run() {
-        if (kgt != null) {
-            signKey = (ECPrivateKey) kgt.getKeyPair().getPrivate();
-            verifyKey = (ECPublicKey) kgt.getKeyPair().getPublic();
-        }
-
         try {
-            sig.initSign(signKey);
-        } catch (InvalidKeyException e) {
-            throw new TestException(e);
-        }
+            if (kgt != null) {
+                signKey = (ECPrivateKey) kgt.getKeyPair().getPrivate();
+                verifyKey = (ECPublicKey) kgt.getKeyPair().getPublic();
+            }
 
-        try {
-            sig.update(data);
-        } catch (SignatureException e) {
-            ok = false;
-            hasRun = true;
-            return;
-        }
+            try {
+                sig.initSign(signKey);
+            } catch (InvalidKeyException e) {
+                ok = false;
+                hasRun = true;
+                return;
+            }
 
-        try {
-            signature = sig.sign();
-        } catch (SignatureException e) {
-            ok = false;
-            hasRun = true;
-            return;
-        }
+            try {
+                sig.update(data);
+            } catch (SignatureException e) {
+                ok = false;
+                hasRun = true;
+                return;
+            }
 
-        try {
-            sig.initVerify(verifyKey);
-        } catch (InvalidKeyException e) {
-            throw new TestException(e);
-        }
+            try {
+                signature = sig.sign();
+            } catch (SignatureException e) {
+                ok = false;
+                hasRun = true;
+                return;
+            }
 
-        try {
-            sig.update(data);
-        } catch (SignatureException e) {
-            ok = false;
-            hasRun = true;
-            return;
-        }
+            try {
+                sig.initVerify(verifyKey);
+            } catch (InvalidKeyException e) {
+                ok = false;
+                hasRun = true;
+                return;
+            }
 
-        try {
-            verified = sig.verify(signature);
-        } catch (SignatureException e) {
+            try {
+                sig.update(data);
+            } catch (SignatureException e) {
+                ok = false;
+                hasRun = true;
+                return;
+            }
+
+            try {
+                verified = sig.verify(signature);
+            } catch (SignatureException e) {
+                ok = false;
+                hasRun = true;
+            }
+
+            ok = true;
+        } catch (Exception ex) {
             ok = false;
-            hasRun = true;
+            error = true;
+            errorCause = ex;
         }
-        ok = true;
         hasRun = true;
     }
 }