X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.slc.runtime%2Fsrc%2Forg%2Fargeo%2Fslc%2Fruntime%2Ftest%2FSimpleTestRun.java;h=44737931d79d1320b04e0e571fe17fb45e660823;hb=09c9e5093fe1353aaac344ac8a8caf2e1dcc0778;hp=a00c48dfa2f3169e046a789d19a117f4d1cdf9ae;hpb=dfac3414a612edd63eaaf8568ddc80271707af22;p=gpl%2Fargeo-slc.git
diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/SimpleTestRun.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/SimpleTestRun.java
index a00c48dfa..44737931d 100644
--- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/SimpleTestRun.java
+++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/SimpleTestRun.java
@@ -1,110 +1,95 @@
-/*
- * 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.runtime.test;
-
-import java.util.UUID;
-
-import org.argeo.slc.deploy.DeployedSystem;
-import org.argeo.slc.test.ExecutableTestRun;
-import org.argeo.slc.test.TestData;
-import org.argeo.slc.test.TestDefinition;
-import org.argeo.slc.test.TestResult;
-import org.argeo.slc.test.WritableTestRun;
-
-/**
- * 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;
- private TestResult testResult;
-
- /** Executes the underlying test definition. */
- public void run() {
- uuid = UUID.randomUUID().toString();
- if (testResult != null)
- testResult.notifyTestRun(this);
-
- testDefinition.execute(this);
- }
-
- @SuppressWarnings("unchecked")
- public T getDeployedSystem() {
- return (T) deployedSystem;
- }
-
- public void setDeployedSystem(DeployedSystem deployedSystem) {
- this.deployedSystem = deployedSystem;
- }
-
- @SuppressWarnings("unchecked")
- public T getTestData() {
- return (T) testData;
- }
-
- public void setTestData(TestData testData) {
- this.testData = testData;
- }
-
- @SuppressWarnings("unchecked")
- public T getTestDefinition() {
- return (T) testDefinition;
- }
-
- public void setTestDefinition(TestDefinition testDefinition) {
- this.testDefinition = testDefinition;
- }
-
- @SuppressWarnings("unchecked")
- 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;
- // }
-}
+package org.argeo.slc.runtime.test;
+
+import java.util.UUID;
+
+import org.argeo.api.slc.deploy.DeployedSystem;
+import org.argeo.api.slc.test.ExecutableTestRun;
+import org.argeo.api.slc.test.TestData;
+import org.argeo.api.slc.test.TestDefinition;
+import org.argeo.api.slc.test.TestResult;
+import org.argeo.api.slc.test.WritableTestRun;
+
+/**
+ * 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;
+ private TestResult testResult;
+
+ /** Executes the underlying test definition. */
+ public void run() {
+ uuid = UUID.randomUUID().toString();
+ if (testResult != null)
+ testResult.notifyTestRun(this);
+
+ testDefinition.execute(this);
+ }
+
+ @SuppressWarnings("unchecked")
+ public T getDeployedSystem() {
+ return (T) deployedSystem;
+ }
+
+ public void setDeployedSystem(DeployedSystem deployedSystem) {
+ this.deployedSystem = deployedSystem;
+ }
+
+ @SuppressWarnings("unchecked")
+ public T getTestData() {
+ return (T) testData;
+ }
+
+ public void setTestData(TestData testData) {
+ this.testData = testData;
+ }
+
+ @SuppressWarnings("unchecked")
+ public T getTestDefinition() {
+ return (T) testDefinition;
+ }
+
+ public void setTestDefinition(TestDefinition testDefinition) {
+ this.testDefinition = testDefinition;
+ }
+
+ @SuppressWarnings("unchecked")
+ 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;
+ // }
+}