Introduce nested tasks

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

diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/ant/test/SlcCloseTestResultTask.java b/org.argeo.slc/src/main/java/org/argeo/slc/ant/test/SlcCloseTestResultTask.java
index 1a5bc7b2f2b63361b17137afab1268330c4097d5..d91c5389804600247512c307eb4e36ee6fde846e 100644 (file)
--- a/org.argeo.slc/src/main/java/org/argeo/slc/ant/test/SlcCloseTestResultTask.java
+++ b/org.argeo.slc/src/main/java/org/argeo/slc/ant/test/SlcCloseTestResultTask.java
@@ -1,20 +1,29 @@
 package org.argeo.slc.ant.test;\r
 \r
-import org.argeo.slc.ant.spring.AbstractSpringTask;\r
+import org.argeo.slc.ant.structure.SAwareTask;\r
+import org.argeo.slc.core.structure.StructureAware;\r
+import org.argeo.slc.core.structure.StructureRegistry;\r
 import org.argeo.slc.core.test.TestReport;\r
 import org.argeo.slc.core.test.TestResult;\r
 \r
-public class SlcCloseTestResultTask extends AbstractSpringTask {\r
+public class SlcCloseTestResultTask extends SAwareTask {\r
        private String result;\r
        private String report;\r
-       \r
-       public void execute(){\r
-               TestResult testResult = (TestResult)getContext().getBean(result);\r
-               testResult.close();\r
-               \r
-               if(report!=null){\r
-                       TestReport testReport = (TestReport)getContext().getBean(report);\r
-                       testReport.generateTestReport(testResult);\r
+\r
+       public void executeActions(String mode) {\r
+               if (!mode.equals(StructureRegistry.READ)) {\r
+                       TestResult testResult = (TestResult) getContext().getBean(result);\r
+                       testResult.close();\r
+\r
+                       if (report != null) {\r
+                               TestReport testReport = (TestReport) getContext().getBean(\r
+                                               report);\r
+                               if (testReport instanceof StructureAware) {\r
+                                       ((StructureAware) testReport).notifyCurrentPath(\r
+                                                       getRegistry(), null);\r
+                               }\r
+                               testReport.generateTestReport(testResult);\r
+                       }\r
                }\r
        }\r
 \r
@@ -25,6 +34,5 @@ public class SlcCloseTestResultTask extends AbstractSpringTask {
        public void setReport(String report) {\r
                this.report = report;\r
        }\r
-       \r
-       \r
+\r
 }\r