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 879c75a12a90cfc8a7397efcc9ed70e61da8162f..ab92fe8b16c5f345c88179e8f0f555802c6e2919 100644 (file)
--- a/org.argeo.slc/src/test/slc/conf/slc.xml
+++ b/org.argeo.slc/src/test/slc/conf/slc.xml
@@ -9,9 +9,19 @@
                <property name="deployedSystem" ref="exampleDeployedSystem" />\r
        </bean>\r
 \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
@@ -21,9 +31,12 @@
        </bean>\r
 \r
        <bean id="testResult2"\r
-               class="org.argeo.slc.core.test.tree.TreeTestResult"\r
-               >\r
-               <property name="numericResultId" ref="testResultId" />\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
@@ -31,11 +44,11 @@
                        </list>\r
                </property>\r
        </bean>\r
-\r
+<!--  \r
        <bean id="testResultId" class="org.argeo.slc.core.test.NumericTRId"\r
                init-method="init" scope="prototype">\r
        </bean>\r
-\r
+-->\r
        <bean\r
                class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />\r
 \r
@@ -48,18 +61,21 @@
                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="skipFreq" value="2" />\r
                <property name="deployedSystemId">\r
                        <bean class="org.argeo.slc.core.deploy.NumericDSId">\r
                                <property name="value" value="123456" />\r
@@ -75,7 +91,7 @@
 \r
        <bean id="exampleDeployedSystem2"\r
                class="org.argeo.slc.example.ExampleDeployedSystem">\r
-               <property name="skipFreq" value="3"/>\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