Simplify structure framework

[gpl/argeo-slc.git] / org.argeo.slc / src / main / java / org / argeo / slc / ant / test / SlcTestTask.java

diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/ant/test/SlcTestTask.java b/org.argeo.slc/src/main/java/org/argeo/slc/ant/test/SlcTestTask.java
index 4dcd31a3bc6677d2f3b9befe27c082753b41048d..69d08eee50727654ba534005592fe964effcff1b 100644 (file)
--- a/org.argeo.slc/src/main/java/org/argeo/slc/ant/test/SlcTestTask.java
+++ b/org.argeo.slc/src/main/java/org/argeo/slc/ant/test/SlcTestTask.java
@@ -2,47 +2,65 @@ package org.argeo.slc.ant.test;
 \r
 import org.apache.tools.ant.BuildException;\r
 \r
-import org.argeo.slc.ant.SAwareArg;\r
-import org.argeo.slc.ant.SAwareTask;\r
 import org.argeo.slc.ant.spring.AbstractSpringArg;\r
-import org.argeo.slc.ant.spring.AbstractSpringTask;\r
+import org.argeo.slc.ant.structure.SAwareTask;\r
+import org.argeo.slc.core.deploy.DeployedSystem;\r
 import org.argeo.slc.core.test.TestData;\r
 import org.argeo.slc.core.test.TestDefinition;\r
+import org.argeo.slc.core.test.TestResult;\r
+import org.argeo.slc.core.test.TestRun;\r
 \r
-public class SlcTestTask extends SAwareTask {\r
+/** Ant task wrapping a test run. */\r
+public class SlcTestTask extends SAwareTask implements TestRun {\r
 \r
        private TestDefinitionArg testDefinitionArg;\r
        private TestDataArg testDataArg;\r
 \r
        @Override\r
-       public void execute() throws BuildException {\r
+       public void executeActions(String mode) throws BuildException {\r
                TestDefinition testDefinition = testDefinitionArg.getTestDefinition();\r
-               testDefinition.setTestData(testDataArg.getTestData());\r
-               testDefinition.execute();\r
+               testDefinition.execute(this);\r
        }\r
 \r
        public TestDefinitionArg createTestDefinition() {\r
                testDefinitionArg = new TestDefinitionArg();\r
-               testDefinitionArg.setParentSAware(sAware);\r
+               addSAwareArg(testDefinitionArg);\r
                return testDefinitionArg;\r
        }\r
 \r
        public TestDataArg createTestData() {\r
                testDataArg = new TestDataArg();\r
-               testDataArg.setParentSAware(sAware);\r
+               addSAwareArg(testDataArg);\r
                return testDataArg;\r
        }\r
+\r
+       public DeployedSystem getDeployedSystem() {\r
+               throw new RuntimeException("Not yet implemented.");\r
+       }\r
+\r
+       public TestDefinition getTestDefinition() {\r
+               return testDefinitionArg.getTestDefinition();\r
+       }\r
+\r
+       public TestData getTestData() {\r
+               return testDataArg.getTestData();\r
+       }\r
+\r
+       public TestResult getTestResult() {\r
+               throw new RuntimeException("Not yet implemented.");\r
+       }\r
+\r
 }\r
 \r
-class TestDefinitionArg extends SAwareArg {\r
-       public TestDefinition getTestDefinition(){\r
-               return (TestDefinition)getBeanInstance();\r
+class TestDefinitionArg extends AbstractSpringArg {\r
+       public TestDefinition getTestDefinition() {\r
+               return (TestDefinition) getBeanInstance();\r
        }\r
 }\r
 \r
-class TestDataArg extends SAwareArg {\r
-       public TestData getTestData(){\r
-               return (TestData)getBeanInstance();\r
+class TestDataArg extends AbstractSpringArg {\r
+       public TestData getTestData() {\r
+               return (TestData) getBeanInstance();\r
        }\r
 \r
 }\r