changes for new Datasource

diff --git a/src/interfaces/jdbc/build.xml b/src/interfaces/jdbc/build.xml
index 278053eeace0d0ea095e228f291c1a73c52539f5..08ec5271f92affd6f55b2605b5622c4b858f2f1b 100644 (file)
--- a/src/interfaces/jdbc/build.xml
+++ b/src/interfaces/jdbc/build.xml
@@ -6,7 +6,7 @@
 
   This file now requires Ant 1.4.1.  2002-04-18
 
-  $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/build.xml,v 1.25 2002/07/23 03:59:54 barry Exp $
+  $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/build.xml,v 1.26 2002/07/30 11:38:13 davec Exp $
 
 -->
 
@@ -21,8 +21,8 @@
   
   
   
-  ff" />
-  
+  n" />
+
   
   
-  test" />
+  postgres" />
   
   
   

diff --git a/src/interfaces/jdbc/org/postgresql/test/JDBC2Tests.java b/src/interfaces/jdbc/org/postgresql/test/JDBC2Tests.java
index 06c594ec551dbd0ebc2f7b5d99b2b86b099c4922..33070c0d9b897cbcb8e1a0a979ecd03110053c2e 100644 (file)
--- a/src/interfaces/jdbc/org/postgresql/test/JDBC2Tests.java
+++ b/src/interfaces/jdbc/org/postgresql/test/JDBC2Tests.java
@@ -2,9 +2,11 @@ package org.postgresql.test;
 
 import junit.framework.TestSuite;
 import junit.framework.TestCase;
+import junit.framework.Test;
 
 import org.postgresql.test.jdbc2.*;
 import java.sql.*;
+import java.lang.reflect.Method;
 
 /*
  * Executes all known tests for JDBC2 and includes some utility methods.
@@ -229,6 +231,16 @@ public class JDBC2Tests extends TestSuite
        suite.addTestSuite( UpdateableResultTest.class );
 
        suite.addTestSuite( CallableStmtTest.class );
+       
+       // try to load the optional test classes
+       try {
+           Class cls = Class.forName("org.postgresql.test.jdbc2.optional.OptionalTestSuite");
+           Method meth = cls.getMethod("suite", new Class[0]);
+           suite.addTest((Test)meth.invoke(null, new Object[0]));
+       } catch (Exception e) {
+           System.err.println("Excluding JDBC 2 Optional Package (DataSource) tests");
+       }
+
        // That's all folks
        return suite;
    }