7 files changed, 88 insertions, 60 deletions

diff --git a/src/cz/crcs/ectester/common/test/Result.java b/src/cz/crcs/ectester/common/test/Result.java
index 5d15a60..a978021 100644
--- a/src/cz/crcs/ectester/common/test/Result.java
+++ b/src/cz/crcs/ectester/common/test/Result.java
@@ -49,18 +49,24 @@ public class Result {
      * A result value of a Test.
      */
     public enum Value {
-        SUCCESS(true),
-        FAILURE(false),
-        UXSUCCESS(false),
-        XFAILURE(true),
-        ERROR(false);
+        SUCCESS(true, "Expected success."),
+        FAILURE(false, "Unexpected failure."),
+        UXSUCCESS(false, "Unexpected success."),
+        XFAILURE(true, "Expected failure."),
+        ERROR(false, "Error.");
 
         private boolean ok;
+        private String desc;
 
         Value(boolean ok) {
             this.ok = ok;
         }
 
+        Value(boolean ok, String desc) {
+            this(ok);
+            this.desc = desc;
+        }
+
         public static Value fromExpected(ExpectedValue expected, boolean successful) {
             switch (expected) {
                 case SUCCESS:
@@ -83,6 +89,10 @@ public class Result {
         public boolean ok() {
             return ok;
         }
+
+        public String description() {
+            return desc;
+        }
     }
 
     /**
diff --git a/src/cz/crcs/ectester/reader/test/CommandTestable.java b/src/cz/crcs/ectester/reader/test/CommandTestable.java
index e3dbd05..f670534 100644
--- a/src/cz/crcs/ectester/reader/test/CommandTestable.java
+++ b/src/cz/crcs/ectester/reader/test/CommandTestable.java
@@ -28,7 +28,6 @@ public class CommandTestable extends BaseTestable {
 
     @Override
     public void run() {
-
         try {
             response = command.send();
         } catch (CardException e) {
diff --git a/src/cz/crcs/ectester/standalone/test/KeyAgreementTest.java b/src/cz/crcs/ectester/standalone/test/KeyAgreementTest.java
index 7672c4b..33c7385 100644
--- a/src/cz/crcs/ectester/standalone/test/KeyAgreementTest.java
+++ b/src/cz/crcs/ectester/standalone/test/KeyAgreementTest.java
@@ -31,7 +31,8 @@ public class KeyAgreementTest extends SimpleTest<KeyAgreementTestable> {
         return new KeyAgreementTest(ka, new TestCallback<KeyAgreementTestable>() {
             @Override
             public Result apply(KeyAgreementTestable keyAgreementTestable) {
-                return new Result(Result.Value.fromExpected(expected, keyAgreementTestable.ok(), keyAgreementTestable.error()));
+                Result.Value value = Result.Value.fromExpected(expected, keyAgreementTestable.ok(), keyAgreementTestable.error());
+                return new Result(value, value.description());
             }
         });
     }
diff --git a/src/cz/crcs/ectester/standalone/test/KeyGeneratorTest.java b/src/cz/crcs/ectester/standalone/test/KeyGeneratorTest.java
index a27c088..02b81a4 100644
--- a/src/cz/crcs/ectester/standalone/test/KeyGeneratorTest.java
+++ b/src/cz/crcs/ectester/standalone/test/KeyGeneratorTest.java
@@ -3,7 +3,6 @@ package cz.crcs.ectester.standalone.test;
 import cz.crcs.ectester.common.test.Result;
 import cz.crcs.ectester.common.test.SimpleTest;
 import cz.crcs.ectester.common.test.TestCallback;
-import cz.crcs.ectester.common.test.TestException;
 
 /**
  * @author Jan Jancar johny@neuromancer.sk
@@ -17,7 +16,8 @@ public class KeyGeneratorTest extends SimpleTest<KeyGeneratorTestable> {
         return new KeyGeneratorTest(kg, new TestCallback<KeyGeneratorTestable>() {
             @Override
             public Result apply(KeyGeneratorTestable keyGenerationTestable) {
-                return new Result(Result.Value.fromExpected(expected, keyGenerationTestable.ok(), keyGenerationTestable.error()));
+                Result.Value value = Result.Value.fromExpected(expected, keyGenerationTestable.ok(), keyGenerationTestable.error());
+                return new Result(value, value.description());
             }
         });
     }
diff --git a/src/cz/crcs/ectester/standalone/test/KeyGeneratorTestable.java b/src/cz/crcs/ectester/standalone/test/KeyGeneratorTestable.java
index 353e87a..774c3ec 100644
--- a/src/cz/crcs/ectester/standalone/test/KeyGeneratorTestable.java
+++ b/src/cz/crcs/ectester/standalone/test/KeyGeneratorTestable.java
@@ -1,7 +1,6 @@
 package cz.crcs.ectester.standalone.test;
 
 import cz.crcs.ectester.common.test.BaseTestable;
-import cz.crcs.ectester.common.test.TestException;
 
 import java.security.InvalidAlgorithmParameterException;
 import java.security.KeyPair;
@@ -42,18 +41,25 @@ public class KeyGeneratorTestable extends BaseTestable {
     @Override
     public void run() {
         try {
-            if (spec != null) {
-                kpg.initialize(spec);
-            } else if (keysize != 0) {
-                kpg.initialize(keysize);
+            try {
+                if (spec != null) {
+                    kpg.initialize(spec);
+                } else if (keysize != 0) {
+                    kpg.initialize(keysize);
+                }
+            } catch (InvalidAlgorithmParameterException e) {
+                hasRun = true;
+                ok = false;
+                return;
             }
-        } catch (InvalidAlgorithmParameterException e) {
-            hasRun = true;
+            kp = kpg.genKeyPair();
+            ok = true;
+
+        } catch (Exception ex) {
             ok = false;
-            return;
+            error = true;
+            errorCause = ex;
         }
-        kp = kpg.genKeyPair();
         hasRun = true;
-        ok = true;
     }
 }
diff --git a/src/cz/crcs/ectester/standalone/test/SignatureTest.java b/src/cz/crcs/ectester/standalone/test/SignatureTest.java
index 74c06f0..481d289 100644
--- a/src/cz/crcs/ectester/standalone/test/SignatureTest.java
+++ b/src/cz/crcs/ectester/standalone/test/SignatureTest.java
@@ -16,7 +16,8 @@ public class SignatureTest extends SimpleTest<SignatureTestable> {
         return new SignatureTest(kg, new TestCallback<SignatureTestable>() {
             @Override
             public Result apply(SignatureTestable signatureTestable) {
-                return new Result(Result.Value.fromExpected(expected, signatureTestable.ok(), signatureTestable.error()));
+                Result.Value value = Result.Value.fromExpected(expected, signatureTestable.ok(), signatureTestable.error());
+                return new Result(value, value.description());
             }
         });
     }
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;
     }
 }