X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Ftest%2FSimpleTestResult.java;h=748d14c0bd49b6e0ecb4e6967c2862b4ebaf783a;hb=1a4b784250a43f6c7421ab5d8567c3bfbf51e990;hp=9ef6cdea3e95da55b9c351b625be73b2f62de92b;hpb=faf680e212bf3e18837c4f798587856e061273b3;p=gpl%2Fargeo-slc.git

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 9ef6cdea3..748d14c0b 100644
--- 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,22 +2,38 @@ package org.argeo.slc.core.test;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.UUID;
 import java.util.Vector;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import org.argeo.slc.core.SlcException;
+
 /**
  * Basic implementation of a test result containing only a list of result parts.
  */
 public class SimpleTestResult implements TestResult {
 	private static Log log = LogFactory.getLog(SimpleTestResult.class);
 
-	private TestResultId testResultId;
+	private String uuid;
+	private String currentTestRunUuid;
+
+	private Boolean throwError = true;
+
 	private Date closeDate;
 	private List<TestResultPart> parts = new Vector<TestResultPart>();
+	
+	private Map<String, String> attributes = new TreeMap<String, String>();
 
 	public void addResultPart(TestResultPart part) {
+		if (throwError && part.getStatus() == ERROR) {
+			throw new SlcException(
+					"There was an error in the underlying test: "
+							+ part.getExceptionMessage());
+		}
 		parts.add(part);
 		if (log.isDebugEnabled())
 			log.debug(part);
@@ -28,15 +44,6 @@ public class SimpleTestResult implements TestResult {
 		closeDate = new Date();
 	}
 
-	public TestResultId getTestResultId() {
-		return testResultId;
-	}
-
-	/** Sets the test result id. */
-	public void setTestResultId(TestResultId testResultId) {
-		this.testResultId = testResultId;
-	}
-
 	public List<TestResultPart> getParts() {
 		return parts;
 	}
@@ -45,4 +52,31 @@ public class SimpleTestResult implements TestResult {
 		return closeDate;
 	}
 
+	public void setThrowError(Boolean throwError) {
+		this.throwError = throwError;
+	}
+
+	public void notifyTestRun(TestRun testRun) {
+		currentTestRunUuid = testRun.getUuid();
+	}
+
+	public String getUuid() {
+		if (uuid == null) {
+			uuid = UUID.randomUUID().toString();
+		}
+		return uuid;
+	}
+
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
+
+	public String getCurrentTestRunUuid() {
+		return currentTestRunUuid;
+	}
+
+	public Map<String, String> getAttributes() {
+		return attributes;
+	}
+
 }