X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.simple%2Fsrc%2Ftest%2Fresources%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2Ftest.xml;h=705aa5a3ffda753b9974ba5df8272401f76d6bb2;hb=4327feb568518f5dc5f67d2feb085e20d48dac8d;hp=8d08ca10563b10c0005b440858753fc61741a57c;hpb=2887de51b854588b4a60ab12124c179997e0a015;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.simple/src/test/resources/org/argeo/slc/core/execution/test.xml b/runtime/org.argeo.slc.support.simple/src/test/resources/org/argeo/slc/core/execution/test.xml
index 8d08ca105..705aa5a3f 100644
--- a/runtime/org.argeo.slc.support.simple/src/test/resources/org/argeo/slc/core/execution/test.xml
+++ b/runtime/org.argeo.slc.support.simple/src/test/resources/org/argeo/slc/core/execution/test.xml
@@ -1,73 +1,76 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	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"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+	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">
 
 	<import resource="imports.xml" /> 
 
-	<bean id="second" parent="slcTemplate.simpleFlow">
-		<property name="executionSpec">
-			<bean parent="slcTemplate.simpleSpec">
-				<property name="attributes">
-					<map>
-						<entry key="testKey">
-							<bean parent="specAttr.primitive" p:value="second" />
-						</entry>
-					</map>
-				</property>
-			</bean>
-		</property>
-		<property name="executables">
-			<list>
-				<ref local="echo1" />
-				<bean class="org.argeo.slc.core.test.SimpleTestRun">
-					<property name="testDefinition" ref="basic.testDef" />
-					<property name="testData" ref="basic.testData" />
-					<property name="testResult" ref="basicTestResult"/>
-				</bean>				
-			</list>
-		</property>
-	</bean>
+ 	<bean id="myTestResult" class="org.argeo.slc.core.test.SimpleTestResult" />
 
+	<bean id="myTestDef" class="org.argeo.slc.core.test.BasicTestDefinition" />
 
-	<bean id="first" parent="slcTemplate.simpleFlow">
-		<property name="executionSpec">
-			<bean parent="slcTemplate.simpleSpec">
-				<property name="attributes">
-					<map>
-						<entry key="testKey">
-							<bean parent="specAttr.primitive" p:value="first" />
-						</entry>
-					</map>
-				</property>
-			</bean>
+	<bean id="myTestRunTemplate" class="org.argeo.slc.core.test.SimpleTestRun" abstract="true">
+		<property name="testDefinition" ref="myTestDef" />
+		<property name="testResult" ref="myTestResult"/>
+	</bean>		
+ 
+	<bean id="spec1" parent="slcTemplate.simpleSpec">
+		<property name="attributes">
+			<map>
+				<entry key="testedComponentId">
+					<bean parent="specAttr.primitive" p:isParameter="true"
+						p:type="integer" />
+				</entry>
+				<entry key="testData1">
+					<bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"
+						p:isParameter="true" p:isFrozen="true" />
+				</entry>
+			</map>
 		</property>
+	</bean>
+
+	<bean id="flowTemplate1" parent="slcTemplate.simpleFlow"
+		abstract="true">
+		<constructor-arg ref="spec1" />
 		<property name="executables">
 			<list>
-				<ref local="second" />
+				<bean parent="task.echo">
+					<property name="message" value="From basic @{testedComponentId}" />
+				</bean>
+				<bean parent="myTestRunTemplate">
+					<property name="testData">
+						<bean parent="parameterRef">
+							<constructor-arg value="testData1" />
+						</bean>
+					</property>
+				</bean>
+				<bean parent="task.echo">
+					<property name="message"><value>From basic @{testedComponentId}</value></property>
+				</bean>		
+				<bean parent="task.echo">
+					<property name="message"><value>testData1='@{testData1}'</value></property>
+				</bean>							
 			</list>
 		</property>
 	</bean>
 
-	<bean id="basic.testData" class="org.argeo.slc.core.test.BasicTestData" scope="execution">
-		<aop:scoped-proxy />
-		<property name="expected" value="first" />
-		<property name="reached" value="@{testKey}" />
-	</bean>
-	
-	<bean id="basic.testDef" class="org.argeo.slc.core.test.BasicTestDefinition">
-		<aop:scoped-proxy />
-	</bean>	
-
-
-	<bean id="echo1" parent="task.echo" scope="execution">
-		<property name="message"
-			value="testKey=@{testKey}" />
-		<aop:scoped-proxy />
+	<bean id="flow1" parent="flowTemplate1" scope="prototype">
+		<constructor-arg>
+			<map>
+				<entry key="testedComponentId" value="200" />
+				<entry key="testData1">
+					<bean class="org.argeo.slc.core.test.BasicTestData" scope="execution">
+						<aop:scoped-proxy/>
+						<property name="expected" value="tata101" />
+ 						<property name="reached" value="tata@{testedComponentId}" />
+					</bean>
+				</entry>
+			</map>			
+		</constructor-arg>
 	</bean>
-	
-	<bean id="basicTestResult" class="org.argeo.slc.core.test.SimpleTestResult" />
 
 </beans>
\ No newline at end of file