New runtime working end to end

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

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