X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Ftest%2FSimpleTestRun.java;h=4f6a12f819f1ef5cead2beb384e81c5ef5fbb9f8;hb=4216976fae84a1b9a7a7c83111b9dd95c7825cf9;hp=86b35323b2353e55572fec4469ec27fbc99ff2d2;hpb=ee6c3543a0ff9403420ce6a9c647723269f14331;p=gpl%2Fargeo-slc.git

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