refactor and clean of the distribution view model.

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

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleTestRun.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleTestRun.java
index 86b35323b2353e55572fec4469ec27fbc99ff2d2..4f6a12f819f1ef5cead2beb384e81c5ef5fbb9f8 100644 (file)
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleTestRun.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleTestRun.java
@@ -1,16 +1,23 @@
+/*\r
+ * Copyright (C) 2007-2012 Argeo GmbH\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ *         http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
 package org.argeo.slc.core.test;\r
 \r
 import java.util.UUID;\r
 \r
-import org.argeo.slc.core.structure.tree.TreeSPath;\r
-import org.argeo.slc.core.structure.tree.TreeSRegistry;\r
 import org.argeo.slc.deploy.DeployedSystem;\r
-import org.argeo.slc.process.SlcExecution;\r
-import org.argeo.slc.process.SlcExecutionRelated;\r
-import org.argeo.slc.process.SlcExecutionStep;\r
-import org.argeo.slc.structure.StructureAware;\r
-import org.argeo.slc.structure.StructureElement;\r
-import org.argeo.slc.structure.StructureRegistry;\r
 import org.argeo.slc.test.ExecutableTestRun;\r
 import org.argeo.slc.test.TestData;\r
 import org.argeo.slc.test.TestDefinition;\r
@@ -21,15 +28,11 @@ import org.argeo.slc.test.WritableTestRun;
  * 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
-               SlcExecutionRelated, StructureAware<TreeSPath> {\r
+public class SimpleTestRun implements WritableTestRun, ExecutableTestRun {\r
        private String uuid;\r
 \r
-       private String slcExecutionUuid;\r
-       private String slcExecutionStepUuid;\r
-\r
-       private TreeSPath path;\r
-       private StructureRegistry<TreeSPath> registry;\r
+       // private String slcExecutionUuid;\r
+       // private String slcExecutionStepUuid;\r
 \r
        private DeployedSystem deployedSystem;\r
        private TestData testData;\r
@@ -42,19 +45,10 @@ public class SimpleTestRun implements WritableTestRun, ExecutableTestRun,
                if (testResult != null)\r
                        testResult.notifyTestRun(this);\r
 \r
-               // Structure\r
-               if (testResult != null && path != null\r
-                               && testResult instanceof StructureAware)\r
-                       ((StructureAware<TreeSPath>) testResult).notifyCurrentPath(\r
-                                       registry, path);\r
-\r
-               if (path != null && testDefinition instanceof StructureAware)\r
-                       ((StructureAware<TreeSPath>) testDefinition).notifyCurrentPath(\r
-                                       registry, path);\r
-\r
                testDefinition.execute(this);\r
        }\r
 \r
+       @SuppressWarnings("unchecked")\r
        public <T extends DeployedSystem> T getDeployedSystem() {\r
                return (T) deployedSystem;\r
        }\r
@@ -63,6 +57,7 @@ public class SimpleTestRun implements WritableTestRun, ExecutableTestRun,
                this.deployedSystem = deployedSystem;\r
        }\r
 \r
+       @SuppressWarnings("unchecked")\r
        public <T extends TestData> T getTestData() {\r
                return (T) testData;\r
        }\r
@@ -71,6 +66,7 @@ public class SimpleTestRun implements WritableTestRun, ExecutableTestRun,
                this.testData = testData;\r
        }\r
 \r
+       @SuppressWarnings("unchecked")\r
        public <T extends TestDefinition> T getTestDefinition() {\r
                return (T) testDefinition;\r
        }\r
@@ -79,6 +75,7 @@ public class SimpleTestRun implements WritableTestRun, ExecutableTestRun,
                this.testDefinition = testDefinition;\r
        }\r
 \r
+       @SuppressWarnings("unchecked")\r
        public <T extends TestResult> T getTestResult() {\r
                return (T) testResult;\r
        }\r
@@ -95,36 +92,19 @@ public class SimpleTestRun implements WritableTestRun, ExecutableTestRun,
                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
-       public void notifyCurrentPath(StructureRegistry<TreeSPath> registry,\r
-                       TreeSPath path) {\r
-               this.registry = registry;\r
-               this.path = path;\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