1 files changed, 38 insertions, 21 deletions

diff --git a/src/cz/crcs/ectester/common/test/Test.java b/src/cz/crcs/ectester/common/test/Test.java
index 3d0baf6..8bf9502 100644
--- a/src/cz/crcs/ectester/common/test/Test.java
+++ b/src/cz/crcs/ectester/common/test/Test.java
@@ -7,33 +7,17 @@ import static cz.crcs.ectester.common.test.Result.Value;
  *
  * @author Jan Jancar johny@neuromancer.sk
  */
-public abstract class Test implements Testable {
+public abstract class Test implements Testable, Cloneable {
     protected boolean hasRun;
+    protected boolean hasStarted;
     protected Result result;
 
     public Result getResult() {
-        if (!hasRun) {
-            return null;
-        }
         return result;
     }
 
-    public Value getResultValue() {
-        if (!hasRun) {
-            return null;
-        }
-        return result.getValue();
-    }
-
-    public String getResultCause() {
-        if (!hasRun) {
-            return null;
-        }
-        return result.getCause();
-    }
-
     public boolean ok() {
-        if (!hasRun) {
+        if (result == null) {
             return true;
         }
         return result.ok();
@@ -41,26 +25,59 @@ public abstract class Test implements Testable {
 
     @Override
     public boolean error() {
-        if (!hasRun) {
+        if (result == null) {
             return false;
         }
         return result.compareTo(Value.ERROR);
     }
 
     @Override
+    public Object errorCause() {
+        if (result == null || !result.compareTo(Value.ERROR)) {
+            return null;
+        }
+        return result.getCause();
+    }
+
+    @Override
     public boolean hasRun() {
         return hasRun;
     }
 
+    public boolean hasStarted() {
+        return hasStarted;
+    }
+
     @Override
     public void reset() {
         hasRun = false;
+        hasStarted = false;
         result = null;
     }
 
     public abstract String getDescription();
 
     @Override
-    public abstract void run() throws TestException;
+    public Test clone() throws CloneNotSupportedException {
+        return (Test) super.clone();
+    }
+
+    @Override
+    public void run() {
+        if (hasRun)
+            return;
+        try {
+            hasStarted = true;
+            runSelf();
+            hasRun = true;
+        } catch (TestException e) {
+            result = new Result(Value.ERROR, e);
+            throw e;
+        } catch (Exception e) {
+            result = new Result(Value.ERROR, e);
+            throw new TestException(e);
+        }
+    }
 
+    protected abstract void runSelf();
 }