From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 21 Jun 2008 17:37:27 +0000 (+0000)
Subject: Restructure example unit tests
X-Git-Tag: argeo-slc-2.1.7~2773
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=39aba651ee1e941262b17e9c6deb7ef009093beb;p=gpl%2Fargeo-slc.git

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 57e491a5e..23788313b 100644
--- 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
index 000000000..c6353942d
--- /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 1862055fa..c34917b79 100644
--- 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) {
 		assertEquals(status, part.getStatus());
 
-		if (log.isTraceEnabled()) {
-			log.trace("Expected message:" + message);
-			log.trace("Reached message:" + part.getMessage());
+		if (message != null) {
+			if (log.isTraceEnabled()) {
+				log.trace("Expected message:" + message);
+				log.trace("Reached message:" + part.getMessage());
+			}
+			assertEquals(message, part.getMessage());
 		}
-		assertEquals(message, part.getMessage());
+
 		if (!skipExceptionMessage) {
 			if (exceptionDescription == null) {
 				assertNull(part.getExceptionMessage());