X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Ftest%2FSimpleTestRun.java;h=bbe5b215cc332d5bfec88249552a4a56002738ac;hb=7ffec52c590ce511b476f55be4ad123418268aa0;hp=c548f9d593357c83227b027438f17aebb02518d7;hpb=faf680e212bf3e18837c4f798587856e061273b3;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 c548f9d59..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 WritableTestRun
, 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,39 +23,76 @@ 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 DeployedSystem getDeployedSystem() {
- return deployedSystem;
+ public T getDeployedSystem() {
+ return (T) deployedSystem;
}
public void setDeployedSystem(DeployedSystem deployedSystem) {
this.deployedSystem = deployedSystem;
}
- public TestData getTestData() {
- return testData;
+ public T getTestData() {
+ return (T) testData;
}
public void setTestData(TestData testData) {
this.testData = testData;
}
- public TestDefinition getTestDefinition() {
- return testDefinition;
+ public T getTestDefinition() {
+ return (T) testDefinition;
}
public void setTestDefinition(TestDefinition testDefinition) {
this.testDefinition = testDefinition;
}
- public TestResult getTestResult() {
- return testResult;
+ public T getTestResult() {
+ 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();
+ }
+ }
+ }
+
}