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;fp=org.argeo.slc%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fant%2Ftest%2FSlcTestTask.java;h=1d5943f5868f0cf6a8c92dc74b049f4cd4c253a6;hb=1a85bfb58f79c5f85b86f8b77aeed8eb0bbe238e;hp=93674a01295cee24e8e98f333cbc44c469401dbe;hpb=a29c28266fef35c1620f6582ec182bad7f7f85ae;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 93674a012..1d5943f58 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
@@ -16,7 +16,9 @@ import org.argeo.slc.core.test.WritableTestRun;
 
 /** Ant task wrapping a test run. */
 public class SlcTestTask extends SAwareTask {
-	Log log = LogFactory.getLog(SlcTestTask.class);
+	private Log log = LogFactory.getLog(SlcTestTask.class);
+
+	private String testRunBean = null;
 
 	private TestDefinitionArg testDefinitionArg;
 	private TestDataArg testDataArg;
@@ -25,27 +27,33 @@ public class SlcTestTask extends SAwareTask {
 
 	@Override
 	public void executeActions(String mode) throws BuildException {
+		final String testRunBeanT;
+		if (testRunBean != null) {
+			testRunBeanT = testRunBean;
+		} else {
+			testRunBeanT = getProject().getUserProperty(
+					SlcAntConfig.DEFAULT_TEST_RUN_PROPERTY);
+		}
 		WritableTestRun testRun = (WritableTestRun) getContext().getBean(
-				getProject().getUserProperty(
-						SlcAntConfig.DEFAULT_TEST_RUN_PROPERTY));
+				testRunBeanT);
 
-		// set overriden references
-		if (testDataArg != null){
+		// set overridden references
+		if (testDataArg != null) {
 			testRun.setTestData(testDataArg.getTestData());
 			log.trace("Overrides test data");
 		}
-		
-		if (testDefinitionArg != null){
+
+		if (testDefinitionArg != null) {
 			testRun.setTestDefinition(testDefinitionArg.getTestDefinition());
 			log.trace("Overrides test definition");
 		}
-		
-		if (deployedSystemArg != null){
+
+		if (deployedSystemArg != null) {
 			testRun.setDeployedSystem(deployedSystemArg.getDeployedSystem());
 			log.trace("Overrides deployed system");
 		}
-		
-		if (testResultArg != null){
+
+		if (testResultArg != null) {
 			testRun.setTestResult(testResultArg.getTestResult());
 			log.trace("Overrides test result");
 		}
@@ -60,6 +68,15 @@ public class SlcTestTask extends SAwareTask {
 		testRun.execute();
 	}
 
+	/**
+	 * The bean name of the test run to use. If not set the default is used.
+	 * 
+	 * @see SlcAntConfig
+	 */
+	public void setTestRun(String testRunBean) {
+		this.testRunBean = testRunBean;
+	}
+
 	public TestDefinitionArg createTestDefinition() {
 		testDefinitionArg = new TestDefinitionArg();
 		// only test definitions can add to path