X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Ftest%2FSimpleTestRun.java;h=bbe5b215cc332d5bfec88249552a4a56002738ac;hb=7a8f034133c1112e187e2a2bfd2c56a8d2452345;hp=684142e96e2c1368112d384e2e0700d5d16f2bcd;hpb=4a32164c4b6e1b1fced50f37e503965c0e3843a9;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleTestRun.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleTestRun.java
index 684142e96..bbe5b215c 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleTestRun.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleTestRun.java
@@ -1,12 +1,21 @@
 package org.argeo.slc.core.test;
 
+import java.util.UUID;
+
 import org.argeo.slc.core.deploy.DeployedSystem;
+import org.argeo.slc.core.process.SlcExecution;
+import org.argeo.slc.core.process.SlcExecutionStep;
 
 /**
  * A basic bean implementation of a <code>WritableTestRun</code>, holding
  * references to the various parts of a test run.
  */
 public class SimpleTestRun implements WritableTestRun, ExecutableTestRun {
+	private String uuid;
+
+	private String slcExecutionUuid;
+	private String slcExecutionStepUuid;
+
 	private DeployedSystem deployedSystem;
 	private TestData testData;
 	private TestDefinition testDefinition;
@@ -14,11 +23,14 @@ public class SimpleTestRun implements WritableTestRun, ExecutableTestRun {
 
 	/** Executes the underlying test definition. */
 	public void execute() {
+		uuid = UUID.randomUUID().toString();
+		if (testResult != null)
+			testResult.notifyTestRun(this);
 		testDefinition.execute(this);
 	}
 
 	public <T extends DeployedSystem> T getDeployedSystem() {
-		return (T)deployedSystem;
+		return (T) deployedSystem;
 	}
 
 	public void setDeployedSystem(DeployedSystem deployedSystem) {
@@ -26,7 +38,7 @@ public class SimpleTestRun implements WritableTestRun, ExecutableTestRun {
 	}
 
 	public <T extends TestData> T getTestData() {
-		return (T)testData;
+		return (T) testData;
 	}
 
 	public void setTestData(TestData testData) {
@@ -34,7 +46,7 @@ public class SimpleTestRun implements WritableTestRun, ExecutableTestRun {
 	}
 
 	public <T extends TestDefinition> T getTestDefinition() {
-		return (T)testDefinition;
+		return (T) testDefinition;
 	}
 
 	public void setTestDefinition(TestDefinition testDefinition) {
@@ -42,11 +54,45 @@ public class SimpleTestRun implements WritableTestRun, ExecutableTestRun {
 	}
 
 	public <T extends TestResult> T getTestResult() {
-		return (T)testResult;
+		return (T) testResult;
 	}
 
 	public void setTestResult(TestResult testResult) {
 		this.testResult = testResult;
 	}
 
+	public String getUuid() {
+		return uuid;
+	}
+
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
+
+	public String getSlcExecutionUuid() {
+		return slcExecutionUuid;
+	}
+
+	public void setSlcExecutionUuid(String slcExecutionUuid) {
+		this.slcExecutionUuid = slcExecutionUuid;
+	}
+
+	public String getSlcExecutionStepUuid() {
+		return slcExecutionStepUuid;
+	}
+
+	public void setSlcExecutionStepUuid(String slcExecutionStepUuid) {
+		this.slcExecutionStepUuid = slcExecutionStepUuid;
+	}
+
+	public void notifySlcExecution(SlcExecution slcExecution) {
+		if (slcExecution != null) {
+			slcExecutionUuid = slcExecution.getUuid();
+			SlcExecutionStep step = slcExecution.currentStep();
+			if (step != null) {
+				slcExecutionStepUuid = step.getUuid();
+			}
+		}
+	}
+
 }