X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.agent%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fant%2Ftest%2FSlcTestTask.java;h=651ccad7b959eefd4c79f6825b7454a214dc6fef;hb=a26a4e7277526fe17e13652362821ac2a1fc273a;hp=263242fb79dde7305c9a827421a99c135f089e49;hpb=847af36ba908ea3285a16e17d809a2b29f207b0a;p=gpl%2Fargeo-slc.git 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 263242fb7..651ccad7b 100644 --- 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; import org.apache.tools.ant.BuildException; import org.argeo.slc.ant.SlcAntConfig; +import org.argeo.slc.ant.SlcAntConstants; import org.argeo.slc.ant.spring.SpringArg; import org.argeo.slc.ant.structure.SAwareTask; import org.argeo.slc.core.deploy.DeployedSystem; @@ -18,6 +19,7 @@ import org.argeo.slc.core.test.TestDefinition; import org.argeo.slc.core.test.TestResult; import org.argeo.slc.core.test.WritableTestRun; import org.argeo.slc.spring.SpringUtils; +import org.springframework.beans.BeansException; /** Ant task wrapping a test run. */ public class SlcTestTask extends SAwareTask { @@ -37,15 +39,19 @@ public class SlcTestTask extends SAwareTask { if (testRunBean != null) { testRunBeanT = testRunBean; } else { - testRunBeanT = getProject().getUserProperty( - SlcAntConfig.DEFAULT_TEST_RUN_PROPERTY); + testRunBeanT = getProject().getProperty( + SlcAntConstants.DEFAULT_TEST_RUN_PROPERTY); } WritableTestRun testRun = null; if (testRunBeanT != null) { - testRun = (WritableTestRun) getContext().getBean(testRunBeanT); - if (log.isTraceEnabled()) - log.trace("Load test run bean from bean name " + testRunBeanT); + try { + testRun = (WritableTestRun) getContext().getBean(testRunBeanT); + if (log.isTraceEnabled()) + log.trace("Load test run bean from bean name " + testRunBeanT); + } catch (BeansException e) { + // silent, will try defaults + } } if (testRun == null) {