ExecutionParameterPostProcessor simplified (stored PropertyValues removed), BeanName...

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

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