Revert change of default test run

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

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 f0326175be126663a19d096684d53748696d4689..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
@@ -99,10 +98,7 @@ public class SlcTestTask extends SAwareTask {
                }\r
 \r
                SlcExecution slcExecution = getSlcExecution();\r
-               if (result != null && slcExecution != null\r
-                               && result instanceof SlcExecutionAware) {\r
-                       ((SlcExecutionAware) result).notifySlcExecution(slcExecution);\r
-               }\r
+               testRun.notifySlcExecution(slcExecution);\r
 \r
                if (result != null && result instanceof StructureAware) {\r
                        ((StructureAware<TreeSPath>) result).notifyCurrentPath(\r