X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.core%2Fext%2Ftest%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FAbstractExecutionFlowTestCase.java;h=004605cab781d6ba524f41bd97250c1bb2142e6e;hb=7d137263a92df9bb874f9c900524dfce640495e6;hp=7cc8705f53ec4f4c1a7595e6dcfc1e89869ff4d3;hpb=0bdf6d74bb140c84fe996586df694bda616ae28b;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.core/ext/test/org/argeo/slc/core/execution/AbstractExecutionFlowTestCase.java b/org.argeo.slc.core/ext/test/org/argeo/slc/core/execution/AbstractExecutionFlowTestCase.java
index 7cc8705f5..004605cab 100644
--- a/org.argeo.slc.core/ext/test/org/argeo/slc/core/execution/AbstractExecutionFlowTestCase.java
+++ b/org.argeo.slc.core/ext/test/org/argeo/slc/core/execution/AbstractExecutionFlowTestCase.java
@@ -20,6 +20,7 @@ import junit.framework.TestCase;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.core.test.SimpleTestResult;
+import org.argeo.slc.execution.ExecutionContext;
 import org.argeo.slc.execution.ExecutionFlow;
 import org.argeo.slc.test.TestResultPart;
 import org.argeo.slc.test.TestStatus;
@@ -59,9 +60,19 @@ public abstract class AbstractExecutionFlowTestCase extends TestCase {
 	protected void configureAndExecuteSlcFlow(String applicationContextSuffix,
 			String beanName) {
 		ConfigurableApplicationContext applicationContext = createApplicationContext(applicationContextSuffix);
+		ExecutionContext executionContext = (ExecutionContext) applicationContext
+				.getBean("executionContext");
 		ExecutionFlow executionFlow = (ExecutionFlow) applicationContext
 				.getBean(beanName);
-		executionFlow.run();
+		if (executionFlow instanceof DefaultExecutionFlow)
+			((DefaultExecutionFlow) executionFlow)
+					.setExecutionContext(executionContext);
+		try {
+			executionContext.beforeFlow(executionFlow);
+			executionFlow.run();
+		} finally {
+			executionContext.afterFlow(executionFlow);
+		}
 		applicationContext.close();
 	}