Improve unit tests

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

diff --git a/org.argeo.slc/src/test/slc/conf/data.xml b/org.argeo.slc/src/test/slc/conf/data.xml
index db94ba5278580a08035b8c20ecf780130bef7340..4ab0629fccc51dc7ae36224a78d03ae3fb6f90b7 100644 (file)
--- a/org.argeo.slc/src/test/slc/conf/data.xml
+++ b/org.argeo.slc/src/test/slc/conf/data.xml
@@ -5,13 +5,16 @@
 \r
        <!-- Results -->\r
        <bean id="dataSourceResults"\r
-               class="org.springframework.jdbc.datasource.DriverManagerDataSource"\r
-               >\r
+               class="org.springframework.jdbc.datasource.SingleConnectionDataSource"\r
+               destroy-method="destroy">\r
                <property name="driverClassName" value="org.hsqldb.jdbcDriver" />\r
+               <!-- <property name="url"\r
+                       value="jdbc:hsqldb:file:${slc.workDir}/results/hsqldb/db;shutdown=true" />-->\r
                <property name="url"\r
-                       value="jdbc:hsqldb:file:${slc.workDir}/results/hsqldb/db" />\r
+                       value="jdbc:hsqldb:mem:results" />\r
                <property name="username" value="sa" />\r
                <property name="password" value="" />\r
+               <property name="suppressClose" value="true" />\r
        </bean>\r
 \r
        <bean id="sessionFactoryResults"\r
@@ -19,6 +22,15 @@
                <property name="dataSource" ref="dataSourceResults" />\r
                <property name="mappingResources">\r
                        <list>\r
+                               <value>\r
+                                       org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml\r
+                               </value>\r
+                               <value>\r
+                                       org/argeo/slc/hibernate/structure/tree/TreeSPath.hbm.xml\r
+                               </value>\r
+                               <value>\r
+                                       org/argeo/slc/hibernate/structure/tree/TreeSRegistry.hbm.xml\r
+                               </value>\r
                                <value>\r
                                        org/argeo/slc/hibernate/test/NumericTRId.hbm.xml\r
                                </value>\r
@@ -26,10 +38,10 @@
                                        org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml\r
                                </value>\r
                                <value>\r
-                                       org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml\r
+                                       org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml\r
                                </value>\r
                                <value>\r
-                                       org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml\r
+                                       org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml\r
                                </value>\r
                        </list>\r
                </property>\r
@@ -41,7 +53,7 @@
                                cache.use_minimal_puts=false\r
                                max_fetch_depth=3\r
                                current_session_context_class=thread\r
-                               hibernate.hbm2ddl.auto=update\r
+                               hibernate.hbm2ddl.auto=create\r
                        </value>\r
                </property>\r
        </bean>\r
@@ -50,4 +62,16 @@
                class="org.argeo.slc.hibernate.test.tree.TestResultDaoHibernate">\r
                <property name="sessionFactory" ref="sessionFactoryResults" />\r
        </bean>\r
+\r
+       <bean id="treeSPathDao"\r
+               class="org.argeo.slc.hibernate.structure.tree.TreeSPathDaoHibernate">\r
+               <property name="sessionFactory" ref="sessionFactoryResults" />\r
+       </bean>\r
+\r
+       <bean id="treeSRegistryDao"\r
+               class="org.argeo.slc.hibernate.structure.tree.TreeSRegistryDaoHibernate">\r
+               <property name="sessionFactory" ref="sessionFactoryResults" />\r
+       </bean>\r
+\r
+\r
 </beans>
\ No newline at end of file