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 df09e520412c3fdbc2ff98d03ab971be2d8e5582..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,7 +2,7 @@ package org.argeo.slc.ant.test;
 \r
 import org.apache.tools.ant.BuildException;\r
 \r
-import org.argeo.slc.ant.structure.SAwareArg;\r
+import org.argeo.slc.ant.spring.AbstractSpringArg;\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
@@ -24,13 +24,13 @@ public class SlcTestTask extends SAwareTask implements TestRun {
 \r
        public TestDefinitionArg createTestDefinition() {\r
                testDefinitionArg = new TestDefinitionArg();\r
-               sAwareArgs.add(testDefinitionArg);\r
+               addSAwareArg(testDefinitionArg);\r
                return testDefinitionArg;\r
        }\r
 \r
        public TestDataArg createTestData() {\r
                testDataArg = new TestDataArg();\r
-               sAwareArgs.add(testDataArg);\r
+               addSAwareArg(testDataArg);\r
                return testDataArg;\r
        }\r
 \r
@@ -52,29 +52,15 @@ public class SlcTestTask extends SAwareTask implements TestRun {
 \r
 }\r
 \r
-class TestDefinitionArg extends SAwareArg {\r
-       private TestDefinition testDefinition;\r
-\r
+class TestDefinitionArg extends AbstractSpringArg {\r
        public TestDefinition getTestDefinition() {\r
-               if (testDefinition == null) {\r
-                       // don't call Spring each time in order not to multi-instantiate\r
-                       // prototype\r
-                       testDefinition = (TestDefinition) getBeanInstance();\r
-               }\r
-               return testDefinition;\r
+               return (TestDefinition) getBeanInstance();\r
        }\r
 }\r
 \r
-class TestDataArg extends SAwareArg {\r
-       private TestData testData;\r
-\r
+class TestDataArg extends AbstractSpringArg {\r
        public TestData getTestData() {\r
-               if (testData == null) {\r
-                       // don't call Spring each time in order not to multi-instantiate\r
-                       // prototype\r
-                       testData = (TestData) getBeanInstance();\r
-               }\r
-               return testData;\r
+               return (TestData) getBeanInstance();\r
        }\r
 \r
 }\r