X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Ftest%2Fresources%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2Fxml%2Fadvanced.xml;fp=runtime%2Forg.argeo.slc.core%2Fsrc%2Ftest%2Fresources%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2Fxml%2Fadvanced.xml;h=41164516afd6bed775f14ffe831845c8ed6ad2b0;hb=30463809ad9db9e57ea3ffce5b2b22e10ec0bf1c;hp=4745a10c1c4b015c313b407f55267ac786bfd269;hpb=b9336fb77b251c886f7bc09ffafeb9818a50eb94;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.core/src/test/resources/org/argeo/slc/core/execution/xml/advanced.xml b/runtime/org.argeo.slc.core/src/test/resources/org/argeo/slc/core/execution/xml/advanced.xml
index 4745a10c1..41164516a 100644
--- a/runtime/org.argeo.slc.core/src/test/resources/org/argeo/slc/core/execution/xml/advanced.xml
+++ b/runtime/org.argeo.slc.core/src/test/resources/org/argeo/slc/core/execution/xml/advanced.xml
@@ -1,72 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:flow="http://www.argeo.org/schema/slc-flow"
+	xmlns:flow="http://www.argeo.org/schema/slc-flow"
 	xsi:schemaLocation="
 	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
 	http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd
-	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
 	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
 
 	<import resource="classpath:org/argeo/slc/core/execution/spring.xml" />
 	<import resource="classpath:/org/argeo/slc/core/test/spring.xml" />
 
+	<bean id="testResult" class="org.argeo.slc.core.test.SimpleTestResult" />
+
+	<bean id="testDef" class="org.argeo.slc.core.test.BasicTestDefinition" />
+
+	<bean id="testRunTemplate" class="org.argeo.slc.core.test.SimpleTestRun" abstract="true">
+		<property name="testDefinition" ref="testDef" />
+		<property name="testResult" ref="testResult"/>
+	</bean>	
+
 	<flow:spec id="advanced.spec">
 		<flow:description>spec description</flow:description>
 		<flow:primitive name="param1" isParameter="true"
 			type="integer" />
-		<flow:ref name="param2" targetClass="org.argeo.slc.core.test.BasicTestData"
-			isParameter="true">
-			<flow:value>
-				<bean class="org.argeo.slc.core.test.BasicTestData">
-					<property name="expected" value="tata" />
-					<property name="reached" value="tata" />
-				</bean>				
-			</flow:value>
-		</flow:ref>	
+		<flow:primitive name="param2" isParameter="true"
+			type="integer" />			
 	</flow:spec>
 
 
 	<flow:flow id="advanced.flowTemplate" abstract="true" spec="advanced.spec"
 		path="/path">
 		<description>flow description</description>
- 		<bean parent="task.echo"
-			scope="execution">
-			<property name="message" value="Advanced: param1=@{param1}" />
-			<aop:scoped-proxy/>
+ 		<bean parent="task.echo">
+			<property name="message" value="Advanced: param1=@{param1}, param2=@{param2}" />
+			<flow:variable/>
 		</bean> 
  		<flow:flow>
- 			<bean parent="task.echo" p:message="Flow in Flow - param1=@{param1}" />
+ 			<bean parent="task.echo" p:message="Flow in Flow - param1=@{param1}, param2=@{param2} [Not variable]" />
  		</flow:flow>
  
-	 	<bean class="org.argeo.slc.core.test.SimpleTestRun">
-			<property name="testDefinition">
-				<bean class="org.argeo.slc.core.test.BasicTestDefinition" />
-			</property>
+		<bean parent="testRunTemplate">
 			<property name="testData">
-				<flow:param name="param2" />
-			</property>
-
-			<property name="testResult">
-				<bean parent="slcDefault.test.basicTreeTestResult" scope="execution">
-					<property name="attributes">
-						<map>
-							<entry key="param1" value="@{param1}" />
-						</map>
-					</property>
-					<aop:scoped-proxy />
+				<bean class="org.argeo.slc.core.test.BasicTestData">
+					<flow:variable/>
+					<property name="expected" value="@{param1}" />
+					<property name="reached" value="@{param2}" />
 				</bean>
-			</property>
+			</property>					
 		</bean>
  
 	</flow:flow>
 
 	<flow:flow id="advanced.flowTemplate2" abstract="true" spec="advanced.spec"
 		path="/path">
- 		<bean parent="task.echo"
-			scope="execution">
-			<property name="message" value="Advanced2: param1=@{param1}" />
-			<aop:scoped-proxy/>
+ 		<bean parent="task.echo" p:message="Advanced2: param1=@{param1}, param2=@{param2}">
+			<flow:variable/>
 		</bean>
 		<flow:flow parent="advanced.flowTemplate">
 			<flow:arg name="param1" value="@{param1}"/>
@@ -80,22 +68,26 @@
 	
 	<flow:flow id="flow1" parent="advanced.flowTemplate">
 		<flow:arg name="param1" value="1" />
+		<flow:arg name="param2" value="1" />
 	</flow:flow>
 	
 	<flow:flow id="flow2">
 		<flow:flow parent="advanced.flowTemplate">
 			<flow:arg name="param1" value="2" />
+			<flow:arg name="param2" value="2" />
 		</flow:flow>
 	</flow:flow>
 
 	<flow:flow id="flow3" parent="advanced.flowTemplate2">
 		<flow:arg name="param1" value="3" />
-		<flow:arg name="param2">
-			<bean class="org.argeo.slc.core.test.BasicTestData">
-				<property name="expected" value="tata" />
-				<property name="reached" value="toto" />
-			</bean>		
-		</flow:arg>
+		<flow:arg name="param2" value="3" />
 	</flow:flow>
+	
+	<flow:flow id="flow4" parent="advanced.flowTemplate">
+		<description>Would fail if param 2 is not changed at execution</description>
+		<flow:arg name="param1" value="4" />
+		<flow:arg name="param2" value="3" />
+	</flow:flow>	
+
 
 </beans>
\ No newline at end of file