Improve unit tests

[gpl/argeo-slc.git] / org.argeo.slc / src / test / slc / conf / slc.xml

diff --git a/org.argeo.slc/src/test/slc/conf/slc.xml b/org.argeo.slc/src/test/slc/conf/slc.xml
index 4b13480f4d4963f3d52325487b4987e260556113..ab92fe8b16c5f345c88179e8f0f555802c6e2919 100644 (file)
--- a/org.argeo.slc/src/test/slc/conf/slc.xml
+++ b/org.argeo.slc/src/test/slc/conf/slc.xml
@@ -9,13 +9,19 @@
                <property name="deployedSystem" ref="exampleDeployedSystem" />\r
        </bean>\r
 \r
-       <bean id="testResultId"\r
-               class="org.argeo.slc.core.test.NumericTRId" init-method="init">\r
+       <bean id="otherTestRun"\r
+               class="org.argeo.slc.core.test.SimpleTestRun" scope="prototype">\r
+               <property name="testResult" ref="testResult2" />\r
+               <property name="deployedSystem" ref="exampleDeployedSystem" />\r
        </bean>\r
 \r
        <bean id="testResult"\r
                class="org.argeo.slc.core.test.tree.TreeTestResult">\r
-               <property name="numericResultId" ref="testResultId" />\r
+               <property name="numericResultId">\r
+                       <bean class="org.argeo.slc.core.test.NumericTRId">\r
+                               <property name="value" value="1" />\r
+                       </bean>\r
+               </property>\r
                <property name="listeners">\r
                        <list>\r
                                <ref bean="resultLogger" />\r
@@ -24,21 +30,52 @@
                </property>\r
        </bean>\r
 \r
+       <bean id="testResult2"\r
+               class="org.argeo.slc.core.test.tree.TreeTestResult">\r
+               <property name="numericResultId">\r
+                       <bean class="org.argeo.slc.core.test.NumericTRId">\r
+                               <property name="value" value="2" />\r
+                       </bean>\r
+               </property>\r
+               <property name="listeners">\r
+                       <list>\r
+                               <ref bean="resultLogger" />\r
+                               <ref bean="resultPersister" />\r
+                       </list>\r
+               </property>\r
+       </bean>\r
+<!--  \r
+       <bean id="testResultId" class="org.argeo.slc.core.test.NumericTRId"\r
+               init-method="init" scope="prototype">\r
+       </bean>\r
+-->\r
        <bean\r
                class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />\r
 \r
        <bean id="resultLogger"\r
                class="org.argeo.slc.core.test.tree.TreeTestResultLogger"\r
-               init-method="init" destroy-method="destroy">\r
+               init-method="init">\r
        </bean>\r
 \r
        <bean id="resultPersister"\r
-               class="org.argeo.slc.core.test.tree.TreeTestResultPersister" init-method="init" destroy-method="destroy">\r
-               <property name="testResultDao" ref="testResultDao"/>\r
+               class="org.argeo.slc.core.test.tree.TreeTestResultPersister"\r
+               init-method="init">\r
+               <property name="testResultDao" ref="testResultDao" />\r
+               <property name="treeSPathDao" ref="treeSPathDao" />\r
+               <property name="treeSRegistryDao" ref="treeSRegistryDao" />\r
+       </bean>\r
+\r
+       <bean id="report"\r
+               class="org.argeo.slc.core.test.tree.FullHtmlTreeReport">\r
+               <property name="testResultDao" ref="testResultDao" />\r
+               <property name="treeSRegistryDao" ref="treeSRegistryDao" />\r
+               <property name="reportDir"\r
+                       value="${slc.workDir}/results/report" />\r
        </bean>\r
 \r
        <bean id="exampleDeployedSystem"\r
                class="org.argeo.slc.example.ExampleDeployedSystem">\r
+               <property name="skipFreq" value="2" />\r
                <property name="deployedSystemId">\r
                        <bean class="org.argeo.slc.core.deploy.NumericDSId">\r
                                <property name="value" value="123456" />\r
@@ -52,4 +89,20 @@
                </property>\r
        </bean>\r
 \r
+       <bean id="exampleDeployedSystem2"\r
+               class="org.argeo.slc.example.ExampleDeployedSystem">\r
+               <property name="skipFreq" value="3" />\r
+               <property name="deployedSystemId">\r
+                       <bean class="org.argeo.slc.core.deploy.NumericDSId">\r
+                               <property name="value" value="654321" />\r
+                               <property name="distributionId">\r
+                                       <bean\r
+                                               class="org.argeo.slc.core.build.VersionDistributionId">\r
+                                               <property name="versionString" value="0.3.1" />\r
+                                       </bean>\r
+                               </property>\r
+                       </bean>\r
+               </property>\r
+       </bean>\r
+\r
 </beans>
\ No newline at end of file