Introduce the Executable interface

git-svn-id: https://svn.argeo.org/slc/trunk@2152 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/Deployment.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/Deployment.java
index 5be7ffd718701b1bab2a6bab32b24ac158fef3d0..7e471f5901e56d25d2740d5eb6117ea7480328ce 100644 (file)
--- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/Deployment.java
+++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/Deployment.java
@@ -1,8 +1,9 @@
 package org.argeo.slc.deploy;\r
 \r
 import org.argeo.slc.build.Distribution;\r
+import org.argeo.slc.process.Executable;\r
 \r
-public interface Deployment {\r
+public interface Deployment extends Executable{\r
        public DeployedSystem getDeployedSystem();\r
 \r
        public void setTargetData(TargetData targetData);\r

diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/Executable.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/Executable.java
new file mode 100644 (file)
index 0000000..129b1c6
--- /dev/null
+++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/Executable.java
@@ -0,0 +1,7 @@
+package org.argeo.slc.process;
+
+/** Any object which can perform processing */
+public interface Executable {
+       /** Executes the actions specified by the object */
+       public void execute();
+}

diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/ExecutableTestRun.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/ExecutableTestRun.java
index db7d01fb3c1db0fece48de1c388c27070eb9eb5c..5b88113775bbd2cf7a21f60393be7465cc1b06bc 100644 (file)
--- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/ExecutableTestRun.java
+++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/ExecutableTestRun.java
@@ -1,9 +1,8 @@
 package org.argeo.slc.test;\r
 \r
-/** A test run that can be executed */\r
-public interface ExecutableTestRun extends TestRun {\r
+import org.argeo.slc.process.Executable;\r
 \r
-       /** Executes this test run. */\r
-       public void execute();\r
+/** A test run that can be executed */\r
+public interface ExecutableTestRun extends TestRun, Executable {\r
 \r
 }\r

diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/IncompatibleTestDataException.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/IncompatibleTestDataException.java
index 1b5a9e47dd11b9db97bb18b3246c60f54e416b4a..44c3aa65eb8156e201168fb9650ec75ee58f83f5 100644 (file)
--- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/IncompatibleTestDataException.java
+++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/IncompatibleTestDataException.java
@@ -15,4 +15,10 @@ public class IncompatibleTestDataException extends SlcException {
                                + " is not compatible with TestDefinition "\r
                                + testDefinition.getClass());\r
        }\r
+\r
+       public IncompatibleTestDataException(TestRun testRun) {\r
+               super("TestData " + testRun.getTestData().getClass()\r
+                               + " is not compatible with TestDefinition "\r
+                               + testRun.getTestDefinition().getClass());\r
+       }\r
 }\r

diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/BasicTestDefinition.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/BasicTestDefinition.java
index fd07cbe58ab75b4a92cde94b4df1797af6c61577..e00d8dac02a4537e81a2a0d601e0cfd0d2681e93 100644 (file)
--- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/BasicTestDefinition.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/BasicTestDefinition.java
@@ -3,6 +3,7 @@ package org.argeo.slc.core.test;
 import org.argeo.slc.SlcException;\r
 import org.argeo.slc.core.structure.tree.TreeSRelatedHelper;\r
 import org.argeo.slc.core.test.context.ContextUtils;\r
+import org.argeo.slc.test.IncompatibleTestDataException;\r
 import org.argeo.slc.test.TestData;\r
 import org.argeo.slc.test.TestDefinition;\r
 import org.argeo.slc.test.TestResult;\r
@@ -38,7 +39,7 @@ public class BasicTestDefinition extends TreeSRelatedHelper implements
                        ContextUtils.compareReachedExpected((ContextAware) testData,\r
                                        testRun.getTestResult(), this);\r
                } else {\r
-                       throw new SlcException("No test data defined.");\r
+                       throw new IncompatibleTestDataException(testRun);\r
                }\r
        }\r
 }\r