- Documentation

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