Move ReailizedFlow to execution package

[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 9a37269e570bc6330eec187daa2fe354a8d31307..a4d396638a973d595c5f429b2d4b7400dbf51538 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,5 +1,5 @@
 /*\r
- * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>\r
+ * Copyright (C) 2007-2012 Mathieu Baudier\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
@@ -13,18 +13,11 @@
  * See the License for the specific language governing permissions and\r
  * limitations under the License.\r
  */\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.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.StructureRegistry;\r
 import org.argeo.slc.test.ExecutableTestRun;\r
 import org.argeo.slc.test.TestData;\r
 import org.argeo.slc.test.TestDefinition;\r
@@ -35,38 +28,23 @@ 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
-\r
        private DeployedSystem deployedSystem;\r
        private TestData testData;\r
        private TestDefinition testDefinition;\r
        private TestResult testResult;\r
 \r
        /** Executes the underlying test definition. */\r
-       @SuppressWarnings("unchecked")\r
        public void run() {\r
                uuid = UUID.randomUUID().toString();\r
                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
@@ -129,21 +107,4 @@ public class SimpleTestRun implements WritableTestRun, ExecutableTestRun,
        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
 }\r