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 c70c922e42b86828a3e333fba3871430c5f27e2b..9b2824886aca8503e3cc6dba6e73186729691772 100644 (file)
--- 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\r
  * <code>slc.test</code> task will use by default. This can be overridden when\r
  * calling the task from Ant.</td>\r
- * <td>slcDefault.test.testRun</td>\r
+ * <td>defaultTestRun</td>\r
  * </tr>\r
  * </table>\r
  * </p>\r
@@ -247,7 +247,7 @@ public class SlcAntConfig {
                        // Default test run\r
                        if (all.getProperty(DEFAULT_TEST_RUN_PROPERTY) == null) {\r
                                all.setProperty(DEFAULT_TEST_RUN_PROPERTY,\r
-                                               "slcDefault.test.testRun");\r
+                                               "defaultTestRun");\r
                        }\r
 \r
                        // Default log4j\r

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 3acfc5e0fab00260e64b5782da7ddd803a78de6b..6f2411c0093ea9454a43caf95538dc8683e6fa8d 100644 (file)
--- 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;\r
 import org.argeo.slc.ant.spring.AbstractSpringArg;\r
 import org.argeo.slc.ant.structure.SAwareTask;\r
+import org.argeo.slc.core.SlcException;\r
 import org.argeo.slc.core.deploy.DeployedSystem;\r
 import org.argeo.slc.core.process.SlcExecution;\r
 import org.argeo.slc.core.process.SlcExecutionAware;\r
@@ -54,8 +55,7 @@ public class SlcTestTask extends SAwareTask {
                        testRun = loadSingleFromContext(WritableTestRun.class);\r
                        if (testRun == null) {\r
                                testRun = new SimpleTestRun();\r
-                               if (log.isTraceEnabled())\r
-                                       log.trace("Created simple test run");\r
+                               log.warn("Created default simple test run");\r
                        } else {\r
                                if (log.isTraceEnabled())\r
                                        log.trace("Load test run from scanning Spring context");\r
@@ -89,8 +89,7 @@ public class SlcTestTask extends SAwareTask {
                        result = loadSingleFromContext(TestResult.class);\r
                        if (result == null) {\r
                                result = new SimpleTestResult();\r
-                               if (log.isTraceEnabled())\r
-                                       log.trace("Created simple test result");\r
+                               log.warn("Created default simple test result");\r
                        } else {\r
                                if (log.isTraceEnabled())\r
                                        log.trace("Load test result from scanning Spring context");\r