Restructure example unit tests

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

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/runtime/SlcExecutionContext.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/runtime/SlcExecutionContext.java
index 57e491a5efbbafa00c1be36386a43bedfc5c4616..23788313bce1805b2da88a8aeb95acbf417bdf8b 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/runtime/SlcExecutionContext.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/runtime/SlcExecutionContext.java
@@ -4,7 +4,7 @@ import org.argeo.slc.core.process.SlcExecution;
 
 /** Provides access to the object used during the execution */
 public interface SlcExecutionContext {
-       public Object getBean(String name);
+       public <T> T getBean(String name);
 
        public SlcExecution getSlcExecution();
 }

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/runtime/SlcExecutionOutput.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/runtime/SlcExecutionOutput.java
new file mode 100644 (file)
index 0000000..c635394
--- /dev/null
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/runtime/SlcExecutionOutput.java
@@ -0,0 +1,6 @@
+package org.argeo.slc.runtime;
+
+public interface SlcExecutionOutput<T extends SlcExecutionContext> {
+       /** Called after the execution, before the resources are freed.*/
+       public void postExecution(T executionContext);
+}

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java
index 1862055fa7607fa413fdbd3ead8e0e0e3c8a2431..c34917b79dc759ac374781481f0b4b17546d0275 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java
@@ -108,11 +108,14 @@ public class UnitTestTreeUtil {
                        String expectedTestRunUuid, boolean skipExceptionMessage) {\r
                assertEquals(status, part.getStatus());\r
 \r
-               if (log.isTraceEnabled()) {\r
-                       log.trace("Expected message:" + message);\r
-                       log.trace("Reached message:" + part.getMessage());\r
+               if (message != null) {\r
+                       if (log.isTraceEnabled()) {\r
+                               log.trace("Expected message:" + message);\r
+                               log.trace("Reached message:" + part.getMessage());\r
+                       }\r
+                       assertEquals(message, part.getMessage());\r
                }\r
-               assertEquals(message, part.getMessage());\r
+\r
                if (!skipExceptionMessage) {\r
                        if (exceptionDescription == null) {\r
                                assertNull(part.getExceptionMessage());\r