X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.slc%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fant%2Ftest%2FSlcTestTask.java;h=69d08eee50727654ba534005592fe964effcff1b;hb=d62a44995fa4bc758ab3b3e6e7ffe7b79c8684ef;hp=df09e520412c3fdbc2ff98d03ab971be2d8e5582;hpb=af47cf1f193f9d9965d9e302e2712712ce623a50;p=gpl%2Fargeo-slc.git

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