database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-16 06:01:02 +03:00
Code Activity

changes for new Datasource

Browse Source
This commit is contained in:
Dave Cramer
2002-07-30 11:38:13 +00:00
parent 6bdbe4ca2c
commit 6410c22265
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/interfaces/jdbc/build.xml
View File

@ -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,7 +21,7 @@
<property name="jardir" value="jars" />
<property name="builddir" value="build" />
<property name="package" value="org/postgresql" />
<property name="debug" value="off" />
<property name="debug" value="on" />
<!--
This is a simpler method than utils.CheckVersion
@ -92,11 +92,14 @@
<exclude name="${package}/largeobject/PGblob.java" if="jdbc1" />
<exclude name="${package}/largeobject/PGclob.java" if="jdbc1" />
<exclude name="${package}/PostgresqlDataSource.java" unless="datasource" />
<exclude name="${package}/xa/**" unless="datasource" />
<exclude name="${package}/jdbc2/optional/**" unless="datasource" />
<exclude name="${package}/PostgresqlDataSource.java" />
<exclude name="${package}/xa/**" />
<exclude name="${package}/test/**" unless="junit" />
<exclude name="${package}/test/jdbc2/**" if="jdbc1" />
<exclude name="${package}/test/jdbc2/optional/**" unless="datasource" />
<exclude name="${package}/test/JDBC2Tests.java" if="jdbc1" />
</javac>
</target>
@ -212,7 +215,7 @@
<!-- defaults for the tests - override these if required -->
<property name="database" value="jdbc:postgresql:test" />
<property name="username" value="test" />
<property name="username" value="postgres" />
<!-- Password must be something. Doesn't matter if trust is used! -->
<property name="password" value="password" />
<!-- junit.ui is one of textui, awtui, or swingui -->

12
src/interfaces/jdbc/org/postgresql/test/JDBC2Tests.java
View File

@ -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;
}