From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 4 May 2008 22:18:40 +0000 (+0000)
Subject: Revert change of default test run
X-Git-Tag: argeo-slc-2.1.7~2923
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=058a6bfa5fe4e90f8ff825b6168eb8a1d5d2101c;hp=9e1c13c89607d19f6f82e5e84d05e207fdaac3fe;p=gpl%2Fargeo-slc.git

Revert change of default test run

git-svn-id: https://svn.argeo.org/slc/trunk@1117 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcAntConfig.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcAntConfig.java
index c70c922e4..9b2824886 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcAntConfig.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcAntConfig.java
@@ -99,7 +99,7 @@ import org.apache.tools.ant.Project;
  * <td>Name of the {@link WritableTestRun} Spring bean that the
  * <code>slc.test</code> task will use by default. This can be overridden when
  * calling the task from Ant.</td>
- * <td>slcDefault.test.testRun</td>
+ * <td>defaultTestRun</td>
  * </tr>
  * </table>
  * </p>
@@ -247,7 +247,7 @@ public class SlcAntConfig {
 			// Default test run
 			if (all.getProperty(DEFAULT_TEST_RUN_PROPERTY) == null) {
 				all.setProperty(DEFAULT_TEST_RUN_PROPERTY,
-						"slcDefault.test.testRun");
+						"defaultTestRun");
 			}
 
 			// Default log4j
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/test/SlcTestTask.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/test/SlcTestTask.java
index 3acfc5e0f..6f2411c00 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/test/SlcTestTask.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/test/SlcTestTask.java
@@ -7,6 +7,7 @@ import org.apache.tools.ant.BuildException;
 import org.argeo.slc.ant.SlcAntConfig;
 import org.argeo.slc.ant.spring.AbstractSpringArg;
 import org.argeo.slc.ant.structure.SAwareTask;
+import org.argeo.slc.core.SlcException;
 import org.argeo.slc.core.deploy.DeployedSystem;
 import org.argeo.slc.core.process.SlcExecution;
 import org.argeo.slc.core.process.SlcExecutionAware;
@@ -54,8 +55,7 @@ public class SlcTestTask extends SAwareTask {
 			testRun = loadSingleFromContext(WritableTestRun.class);
 			if (testRun == null) {
 				testRun = new SimpleTestRun();
-				if (log.isTraceEnabled())
-					log.trace("Created simple test run");
+				log.warn("Created default simple test run");
 			} else {
 				if (log.isTraceEnabled())
 					log.trace("Load test run from scanning Spring context");
@@ -89,8 +89,7 @@ public class SlcTestTask extends SAwareTask {
 			result = loadSingleFromContext(TestResult.class);
 			if (result == null) {
 				result = new SimpleTestResult();
-				if (log.isTraceEnabled())
-					log.trace("Created simple test result");
+				log.warn("Created default simple test result");
 			} else {
 				if (log.isTraceEnabled())
 					log.trace("Load test result from scanning Spring context");