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 a1dbc7ed972083abd2d78c2918d85e52a6720168..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
@@ -9,78 +9,67 @@
 \r
        <import resource="imports.xml" /> \r
 \r
-       <bean id="fileDiff.spec" parent="slcTemplate.simpleSpec">\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="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="fileName">\r
-                                       <bean parent="specAttr.primitive" p:isParameter="true" p:type="string"\r
-                                               p:isFrozen="true" />\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="fileDiff.flowTemplate" parent="slcTemplate.simpleFlow"\r
+       <bean id="flowTemplate1" parent="slcTemplate.simpleFlow"\r
                abstract="true">\r
-               <property name="path" value="/fileDiff/testcases" />\r
-               <constructor-arg ref="fileDiff.spec" />\r
+               <constructor-arg ref="spec1" />\r
                <property name="executables">\r
                        <list>\r
-                               <bean parent="task.echo" scope="execution">\r
-                                       <property name="message" value="From FileDiff @{fileName}" />\r
-                                       <aop:scoped-proxy />\r
+                               <bean parent="task.echo">\r
+                                       <property name="message" value="From basic @{testedComponentId}" />\r
                                </bean>\r
-\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="myTestRunTemplate">\r
                                        <property name="testData">\r
-                                               <bean id="simpleList.testData" class="org.argeo.slc.core.test.BasicTestData" scope="prototype">\r
-                                                       <property name="expected">\r
-                                                               <value>myValue</value>\r
-                                                       </property>\r
-                                                       <property name="reached">\r
-                                                               <value>myValue2</value>\r
-                                                       </property>\r
-                                               </bean>                                                 \r
+                                               <bean parent="parameterRef">\r
+                                                       <constructor-arg value="testData1" />\r
+                                               </bean>\r
                                        </property>\r
-                                       <property name="testResult" ref="fileDiff.testResult" />\r
-                               </bean>\r
-\r
-                               <bean class="org.argeo.slc.core.execution.tasks.CloseTestResultTask" scope="execution">\r
-                                       <property name="testResult" ref="fileDiff.testResult" />\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="fileDiff.testResult" parent="slcDefault.test.basicTreeTestResult"\r
-               scope="execution">\r
-               <aop:scoped-proxy />\r
-               <property name="attributes">\r
-                       <map>\r
-                               <entry key="testCase" value="@{fileName}" />\r
-                               <entry key="testCaseType" value="csvdiff" />\r
-                       </map>\r
-               </property>\r
-               <property name="listeners" ref="resultListeners" /> \r
-       </bean>\r
-\r
-       <bean id="fileDiff.SimulationView_Risk" parent="fileDiff.flowTemplate">\r
+       <bean id="flow1" parent="flowTemplate1" scope="prototype">\r
                <constructor-arg>\r
                        <map>\r
-                               <entry key="fileName" value="SimulationView_Risk" />\r
-                       </map>\r
-               </constructor-arg>\r
-       </bean>\r
-\r
-       <bean id="fileDiff.SimulationView_Risk2" parent="fileDiff.flowTemplate">\r
-               <constructor-arg>\r
-                       <map>\r
-                               <entry key="fileName" value="SimulationView_Risk2" />\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