svn commit: r497609 - /db/derby/code/trunk/build.xml

[dj...@apache.org]

Author: djd
Date: Thu Jan 18 14:34:17 2007
New Revision: 497609

URL: http://svn.apache.org/viewvc?view=rev&rev=497609
Log:
DERBY-1952 (partial) Add the Junit tests for testing auto-booting of jdbc drivers into the set run
via ant with their own target junit-autoloadtest. These are also run by the junit-all target.

Modified:
    db/derby/code/trunk/build.xml

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?view=diff&rev=497609&r1=497608&r2=497609
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Thu Jan 18 14:34:17 2007
@@ -342,7 +342,8 @@
   <target name="tools" depends="engine">
     <ant dir="${derby.tools.src.dir}"/>
   </target>
-
+	
+	
   <target name="shared" depends="init,state">
     <ant dir="${derby.shared.src.dir}"/>
   </target>
@@ -367,6 +368,8 @@
   <target name="testing" depends="demo">
     <ant dir="${derby.testing.src.dir}"/>
   </target>
+	
+
 
 <!-- ==================================================================== -->
 <!--                     Build SanityState.java                           -->
@@ -1692,7 +1695,7 @@
     </antcall>
   </target>
 
-  <target name="junit-all" depends="junit-init,junit-jdbc4">
+  <target name="junit-all" depends="junit-init,junit-jdbc4,junit-autoloadtest">
     <antcall target="junit-oneclass">
       <param name="derby.junit.testname"
              value="org.apache.derbyTesting.functionTests.tests.derbynet._Suite"/>
@@ -1714,7 +1717,36 @@
              value="org.apache.derbyTesting.functionTests.tests.store._Suite"/>
     </antcall>
   </target>
-
+	
+  <!--
+  Autoloading tests need to be run in a separate JVM thus
+  as a separate test. This target runs the test a number of 
+  times, each with a different setting for jdbc.drivers.
+  When run with jar files on java SE 6/JDBC 4 the run without
+  setting jdbc.drivers will test that autoloading from
+  the manifest file works. The settings with jdbc.drivers
+  test the auto-loading in non JDBC 4 environments and
+  that setting jdbc.drivers in JDBC 4 does not cause issues.
+   -->
+  <target name="junit-autoloadtest" depends="junit-init">
+    <antcall target="junit-oneclass">
+      <param name="derby.junit.testname"
+        value="org.apache.derbyTesting.functionTests.tests.jdbcapi.AutoloadTest"/>
+    </antcall>
+    <antcall target="junit-oneclass">
+      <param name="derby.junit.testname"
+        value="org.apache.derbyTesting.functionTests.tests.jdbcapi.JDBCDriversEmbeddedTest"/>
+    </antcall>
+    <antcall target="junit-oneclass">
+      <param name="derby.junit.testname"
+        value="org.apache.derbyTesting.functionTests.tests.jdbcapi.JDBCDriversClientTest"/>
+    </antcall>
+    <antcall target="junit-oneclass">
+      <param name="derby.junit.testname"
+        value="org.apache.derbyTesting.functionTests.tests.jdbcapi.JDBCDriversAllTest"/>
+    </antcall>
+  </target>
+ 
   <target name="junitreport" depends="junit-sysinfo,junit-all">
     <junitreport todir="junit_${derby.junit.timestamp}">
       <fileset dir="junit_${derby.junit.timestamp}">