Various changes

[gpl/argeo-slc.git] / org.argeo.slc.core / src / main / java / org / argeo / slc / core / test / SimpleTestResult.java

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleTestResult.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleTestResult.java
index a89ffe7370c718636bba02634db79ec8f55a0c22..c1d783a77618bfc7f9309d0dfc256393683a0a7f 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleTestResult.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleTestResult.java
@@ -2,6 +2,7 @@ package org.argeo.slc.core.test;
 \r
 import java.util.Date;\r
 import java.util.List;\r
+import java.util.UUID;\r
 import java.util.Vector;\r
 \r
 import org.apache.commons.logging.Log;\r
@@ -15,16 +16,19 @@ import org.argeo.slc.core.SlcException;
 public class SimpleTestResult implements TestResult {\r
        private static Log log = LogFactory.getLog(SimpleTestResult.class);\r
 \r
+       private String uuid;\r
+       private String currentTestRunUuid;\r
+\r
        private Boolean throwError = true;\r
 \r
-       private TestResultId testResultId;\r
        private Date closeDate;\r
        private List<TestResultPart> parts = new Vector<TestResultPart>();\r
 \r
        public void addResultPart(TestResultPart part) {\r
                if (throwError && part.getStatus() == ERROR) {\r
-                       throw new SlcException("There was an error in the underlying test",\r
-                                       part.getException());\r
+                       throw new SlcException(\r
+                                       "There was an error in the underlying test: "\r
+                                                       + part.getExceptionMessage());\r
                }\r
                parts.add(part);\r
                if (log.isDebugEnabled())\r
@@ -36,15 +40,6 @@ public class SimpleTestResult implements TestResult {
                closeDate = new Date();\r
        }\r
 \r
-       public TestResultId getTestResultId() {\r
-               return testResultId;\r
-       }\r
-\r
-       /** Sets the test result id. */\r
-       public void setTestResultId(TestResultId testResultId) {\r
-               this.testResultId = testResultId;\r
-       }\r
-\r
        public List<TestResultPart> getParts() {\r
                return parts;\r
        }\r
@@ -57,4 +52,23 @@ public class SimpleTestResult implements TestResult {
                this.throwError = throwError;\r
        }\r
 \r
+       public void notifyTestRun(TestRun testRun) {\r
+               currentTestRunUuid = testRun.getUuid();\r
+       }\r
+\r
+       public String getUuid() {\r
+               if (uuid == null) {\r
+                       uuid = UUID.randomUUID().toString();\r
+               }\r
+               return uuid;\r
+       }\r
+\r
+       public void setUuid(String uuid) {\r
+               this.uuid = uuid;\r
+       }\r
+\r
+       public String getCurrentTestRunUuid() {\r
+               return currentTestRunUuid;\r
+       }\r
+\r
 }\r