Placeholder supported in maps

[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..fda8c2a2e1d99e8049d0023853b8e443c3c98de6 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
@@ -8,7 +8,7 @@
        <import resource="imports.xml" /> \r
 \r
        <bean id="second" parent="slcTemplate.simpleFlow">\r
-               <property name="executionSpec">\r
+               <constructor-arg>\r
                        <bean parent="slcTemplate.simpleSpec">\r
                                <property name="attributes">\r
                                        <map>\r
@@ -18,7 +18,7 @@
                                        </map>\r
                                </property>\r
                        </bean>\r
-               </property>\r
+               </constructor-arg>\r
                <property name="executables">\r
                        <list>\r
                                <ref local="echo1" />\r
@@ -31,9 +31,9 @@
                </property>\r
        </bean>\r
 \r
-\r
+<!-- \r
        <bean id="first" parent="slcTemplate.simpleFlow">\r
-               <property name="executionSpec">\r
+               <constructor-arg>\r
                        <bean parent="slcTemplate.simpleSpec">\r
                                <property name="attributes">\r
                                        <map>\r
@@ -43,29 +43,35 @@
                                        </map>\r
                                </property>\r
                        </bean>\r
-               </property>\r
+               </constructor-arg>\r
                <property name="executables">\r
                        <list>\r
                                <ref local="second" />\r
+                               <ref local="echo1" />\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
+ -->\r
+       <bean id="basic.testData" class="org.argeo.slc.core.test.BasicTestData" scope="prototype">\r
+               <property name="expected">\r
+                       <map>\r
+                               <entry key="test" value="second" />\r
+                       </map>\r
+               </property>\r
+               <property name="reached">\r
+                       <map>\r
+                               <entry key="test" value="@{testKey}" />\r
+                       </map>\r
+               </property>\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
+       <bean id="echo1" parent="task.echo" scope="prototype">\r
                <property name="message"\r
                        value="testKey=@{testKey}" />\r
-               <aop:scoped-proxy />\r
        </bean>\r
        \r
        <bean id="basicTestResult" class="org.argeo.slc.core.test.SimpleTestResult" />\r