From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 27 Jun 2009 15:09:56 +0000 (+0000)
Subject: Introduce execution flow test case
X-Git-Tag: argeo-slc-2.1.7~1737
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=ab5ba5079a149ad86f88e6665fdf3e9625440e64;hp=2c869e2018c588021cea6059b30b2ba38b586a9b;p=gpl%2Fargeo-slc.git

Introduce execution flow test case

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

diff --git a/runtime/org.argeo.slc.core/.settings/org.eclipse.jdt.core.prefs b/runtime/org.argeo.slc.core/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..f64d98d0e
--- /dev/null
+++ b/runtime/org.argeo.slc.core/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Sat Jun 27 17:07:29 CEST 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/AbstractExecutionFlowGenerator.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/AbstractExecutionFlowGenerator.java
index a6f0a2cde..772d445d0 100644
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/AbstractExecutionFlowGenerator.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/AbstractExecutionFlowGenerator.java
@@ -24,7 +24,6 @@ public abstract class AbstractExecutionFlowGenerator implements
 	protected abstract Map<String, BeanDefinition> createExecutionFlowDefinitions(
 			ConfigurableListableBeanFactory beanFactory);
 
-	@Override
 	public void postProcessBeanFactory(
 			ConfigurableListableBeanFactory beanFactory) throws BeansException {
 		if (!(beanFactory instanceof BeanDefinitionRegistry)) {
@@ -54,7 +53,6 @@ public abstract class AbstractExecutionFlowGenerator implements
 		return bd;
 	}
 
-	@Override
 	public int getOrder() {
 		return Ordered.HIGHEST_PRECEDENCE;
 	}
diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/BasicTestDefinition.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/BasicTestDefinition.java
index 876a3e163..ef3979870 100644
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/BasicTestDefinition.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/BasicTestDefinition.java
@@ -20,6 +20,9 @@ public class BasicTestDefinition extends TreeSRelatedHelper implements
 			BasicTestData testData = testRun.getTestData();
 			TestResult result = testRun.getTestResult();
 
+			if (result == null)
+				throw new SlcException("No test result defined.");
+
 			try {
 				if (testData.getExpected().equals(testData.getReached())) {
 					result.addResultPart(new SimpleResultPart(
diff --git a/runtime/org.argeo.slc.unit/.settings/org.eclipse.jdt.core.prefs b/runtime/org.argeo.slc.unit/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..fb8b3c812
--- /dev/null
+++ b/runtime/org.argeo.slc.unit/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Sat Jun 27 16:59:43 CEST 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/runtime/org.argeo.slc.unit/src/main/java/org/argeo/slc/unit/execution/AbstractExecutionFlowTestcase.java b/runtime/org.argeo.slc.unit/src/main/java/org/argeo/slc/unit/execution/AbstractExecutionFlowTestcase.java
new file mode 100644
index 000000000..1bb049941
--- /dev/null
+++ b/runtime/org.argeo.slc.unit/src/main/java/org/argeo/slc/unit/execution/AbstractExecutionFlowTestcase.java
@@ -0,0 +1,13 @@
+package org.argeo.slc.unit.execution;
+
+import org.argeo.slc.execution.ExecutionFlow;
+import org.argeo.slc.unit.AbstractSpringTestCase;
+
+public class AbstractExecutionFlowTestcase extends AbstractSpringTestCase {
+	@SuppressWarnings(value = { "unchecked" })
+	protected <T extends ExecutionFlow> T executeFlow(String flowName) {
+		ExecutionFlow flow = getBean(flowName);
+		flow.run();
+		return (T) flow;
+	}
+}