Simplify new runtime

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

diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/test/SlcTestTask.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/test/SlcTestTask.java
index 263242fb79dde7305c9a827421a99c135f089e49..651ccad7b959eefd4c79f6825b7454a214dc6fef 100644 (file)
--- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/test/SlcTestTask.java
+++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/test/SlcTestTask.java
@@ -4,6 +4,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;\r
 import org.apache.tools.ant.BuildException;\r
 import org.argeo.slc.ant.SlcAntConfig;\r
+import org.argeo.slc.ant.SlcAntConstants;\r
 import org.argeo.slc.ant.spring.SpringArg;\r
 import org.argeo.slc.ant.structure.SAwareTask;\r
 import org.argeo.slc.core.deploy.DeployedSystem;\r
@@ -18,6 +19,7 @@ import org.argeo.slc.core.test.TestDefinition;
 import org.argeo.slc.core.test.TestResult;\r
 import org.argeo.slc.core.test.WritableTestRun;\r
 import org.argeo.slc.spring.SpringUtils;\r
+import org.springframework.beans.BeansException;\r
 \r
 /** Ant task wrapping a test run. */\r
 public class SlcTestTask extends SAwareTask {\r
@@ -37,15 +39,19 @@ public class SlcTestTask extends SAwareTask {
                if (testRunBean != null) {\r
                        testRunBeanT = testRunBean;\r
                } else {\r
-                       testRunBeanT = getProject().getUserProperty(\r
-                                       SlcAntConfig.DEFAULT_TEST_RUN_PROPERTY);\r
+                       testRunBeanT = getProject().getProperty(\r
+                                       SlcAntConstants.DEFAULT_TEST_RUN_PROPERTY);\r
                }\r
                WritableTestRun testRun = null;\r
 \r
                if (testRunBeanT != null) {\r
-                       testRun = (WritableTestRun) getContext().getBean(testRunBeanT);\r
-                       if (log.isTraceEnabled())\r
-                               log.trace("Load test run bean from bean name " + testRunBeanT);\r
+                       try {\r
+                               testRun = (WritableTestRun) getContext().getBean(testRunBeanT);\r
+                               if (log.isTraceEnabled())\r
+                                       log.trace("Load test run bean from bean name " + testRunBeanT);\r
+                       } catch (BeansException e) {\r
+                               // silent, will try defaults\r
+                       }\r
                }\r
 \r
                if (testRun == null) {\r