slc flow namespace extended (flow:variables, list, map, etc. in flow:arg and spec...

[gpl/argeo-slc.git] / runtime / org.argeo.slc.core / src / test / resources / org / argeo / slc / core / execution / xml / advanced.xml

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