[jboss-svn-commits] JBL Code SVN: r8487 - in labs/jbossesb/trunk/product/core/rosetta/tests: . src/org/jboss/soa/esb/helpers/persist

[jboss-svn-commits at lists.jboss.org]

Author: kevin.conner at jboss.com
Date: 2006-12-21 06:58:11 -0500 (Thu, 21 Dec 2006)
New Revision: 8487

Modified:
   labs/jbossesb/trunk/product/core/rosetta/tests/build.xml
   labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConnUnitTest.java
   labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/helpers/persist/SimpleDataSourceUnitTest.java
Log:
Created temporary database for tests

Modified: labs/jbossesb/trunk/product/core/rosetta/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/build.xml	2006-12-21 11:08:12 UTC (rev 8486)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/build.xml	2006-12-21 11:58:11 UTC (rev 8487)
@@ -21,6 +21,7 @@
         <property name="org.jboss.esb.test.ftp.user" value="anonymous"/>
         <property name="org.jboss.esb.test.ftp.pwd" value=""/>
         <property name="org.jboss.esb.test.ftp.dir" value="/pub/DNS"/>
+        <property name="org.jboss.esb.test.persistdb.dir" location="${org.jboss.esb.internal.dest}/testdb"/>
     <condition property="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.jboss.home}/client">
         <equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
     </condition>
@@ -91,6 +92,11 @@
     <!-- ====================================================================== -->
     <target name="org.jboss.esb.services.internal.test.exec">
         <echo message="Running tests for module, excluding integration"/>
+        <delete dir="${org.jboss.esb.test.persistdb.dir}" failonerror="false"/>
+        <mkdir dir="${org.jboss.esb.test.persistdb.dir}"/>
+        <copy todir="${org.jboss.esb.test.persistdb.dir}">
+            <fileset dir="resources/etc/" includes="persistUnitTestDB*"/>
+        </copy>
 
         <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
             <formatter type="plain" usefile="false"/>
@@ -121,6 +127,7 @@
         	<sysproperty key="org.jboss.esb.test.ftp.user" value="${org.jboss.esb.test.ftp.user}"/>
         	<sysproperty key="org.jboss.esb.test.ftp.pwd" value="${org.jboss.esb.test.ftp.pwd}"/>
         	<sysproperty key="org.jboss.esb.test.ftp.dir" value="${org.jboss.esb.test.ftp.dir}"/>
+                <sysproperty key="org.jboss.esb.test.persistdb.dir" value="${org.jboss.esb.test.persistdb.dir}"/>
         	<sysproperty key="log4j.configuration" value="log4j.xml"/>
         </junit>
         <junitreport>
@@ -164,6 +171,11 @@
 	    <!-- ====================================================================== -->
 	    <target name="org.jboss.esb.services.internal.integration.test.exec">
 	        <echo message="Running all tests for module"/>
+                <delete dir="${org.jboss.esb.test.persistdb.dir}" failonerror="false"/>
+                <mkdir dir="${org.jboss.esb.test.persistdb.dir}"/>
+                <copy todir="${org.jboss.esb.test.persistdb.dir}">
+                    <fileset dir="resources/etc/" includes="persistUnitTestDB*"/>
+                </copy>
 
 	        <junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
 	            <formatter type="plain" usefile="false"/>
@@ -195,6 +207,7 @@
 	        	<sysproperty key="org.jboss.esb.test.ftp.user" value="${org.jboss.esb.test.ftp.user}"/>
 	        	<sysproperty key="org.jboss.esb.test.ftp.pwd" value="${org.jboss.esb.test.ftp.pwd}"/>
 	        	<sysproperty key="org.jboss.esb.test.ftp.dir" value="${org.jboss.esb.test.ftp.dir}"/>
+                        <sysproperty key="org.jboss.esb.test.persistdb.dir" value="${org.jboss.esb.test.persistdb.dir}"/>
 	        	<sysproperty key="log4j.configuration" value="log4j.xml"/>
 	        </junit>
 	        <junitreport>

Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConnUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConnUnitTest.java	2006-12-21 11:08:12 UTC (rev 8486)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConnUnitTest.java	2006-12-21 11:58:11 UTC (rev 8487)
@@ -47,9 +47,10 @@
 public class JdbcCleanConnUnitTest
 {
 
-
+    private static final String PERSIST_DB_DIR = System.getProperty("org.jboss.esb.test.persistdb.dir",
+    		"./core/rosetta/tests/resources/etc") ;
     private static String mDbDriver ="org.hsqldb.jdbcDriver";
-    private static String mDbUrl = "jdbc:hsqldb:file:./core/rosetta/tests/resources/etc/persistUnitTestDB";
+    private static String mDbUrl = "jdbc:hsqldb:file:" + PERSIST_DB_DIR + "/persistUnitTestDB";
     private static String mDbUsername = "sa";
     private static String mDbPassword ="";
 
@@ -67,7 +68,7 @@
     {
         try
         {
-            HsqldbUtil.startHsqldb("./core/rosetta/tests/resources/etc/persistUnitTestDB", "persistUnitTestDB");
+            HsqldbUtil.startHsqldb(PERSIST_DB_DIR + "/persistUnitTestDB", "persistUnitTestDB");
         }
         catch (Exception e)
         {

Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/helpers/persist/SimpleDataSourceUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/helpers/persist/SimpleDataSourceUnitTest.java	2006-12-21 11:08:12 UTC (rev 8486)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/helpers/persist/SimpleDataSourceUnitTest.java	2006-12-21 11:58:11 UTC (rev 8487)
@@ -49,9 +49,10 @@
 public class SimpleDataSourceUnitTest
 {
 
-
+    private static final String PERSIST_DB_DIR = System.getProperty("org.jboss.esb.test.persistdb.dir",
+    		"./core/rosetta/tests/resources/etc") ;
     private static String mDbDriver ="org.hsqldb.jdbcDriver";
-    private static String mDbUrl = "jdbc:hsqldb:file:./core/rosetta/tests/resources/etc/persistUnitTestDB";
+    private static String mDbUrl = "jdbc:hsqldb:file:" + PERSIST_DB_DIR + "/persistUnitTestDB";
     private static String mDbUsername = "sa";
     private static String mDbPassword ="";
 
@@ -68,7 +69,7 @@
     {
         try
         {
-            HsqldbUtil.startHsqldb("./core/rosetta/tests/resources/etc/persistUnitTestDB", "persistUnitTestDB");
+            HsqldbUtil.startHsqldb(PERSIST_DB_DIR + "/persistUnitTestDB", "persistUnitTestDB");
         }
         catch (Exception e)
         {