1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch from Kris Jurka to allow the server end port to be specified when running

Browse Source 
regression tests, this is a backpatch to 7.4
This commit is contained in:
Dave Cramer 2003-12-05 21:06:12 +00:00
parent 88ae594bde
commit dfaf736bc7
7 changed files with 48 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/interfaces/jdbc/org/postgresql/test/TestUtil.java
View File

@ -12,6 +12,30 @@ public class TestUtil
* Returns the Test database JDBC URL * Returns the Test database JDBC URL
*/ */
public static String getURL() public static String getURL()
{
return "jdbc:postgresql://"+getServer()+":"+getPort()+"/"+getDatabase();
}
/*
* Returns the Test server
*/
public static String getServer()
{
return System.getProperty("server");
}
/*
* Returns the Test port
*/
public static int getPort()
{
return Integer.parseInt(System.getProperty("port"));
}
/*
* Returns the Test database
*/
public static String getDatabase()
{ {
return System.getProperty("database"); return System.getProperty("database");
} }

15
src/interfaces/jdbc/org/postgresql/test/jdbc2/optional/ConnectionPoolTest.java
View File

@ -11,7 +11,7 @@ import java.sql.*;
* interface to the PooledConnection is through the CPDS. * interface to the PooledConnection is through the CPDS.
* *
* @author Aaron Mulder (ammulder@chariotsolutions.com) * @author Aaron Mulder (ammulder@chariotsolutions.com)
* @version $Revision: 1.6 $ * @version $Revision: 1.6.4.1 $
*/ */
public class ConnectionPoolTest extends BaseDataSourceTest public class ConnectionPoolTest extends BaseDataSourceTest
{ {
@ -31,16 +31,9 @@ public class ConnectionPoolTest extends BaseDataSourceTest
if (bds == null) if (bds == null)
{ {
bds = new ConnectionPool(); bds = new ConnectionPool();
String db = TestUtil.getURL(); bds.setServerName(TestUtil.getServer());
if (db.indexOf('/') > -1) bds.setPortNumber(TestUtil.getPort());
{ bds.setDatabaseName(TestUtil.getDatabase());
db = db.substring(db.lastIndexOf('/') + 1);
}
else if (db.indexOf(':') > -1)
{
db = db.substring(db.lastIndexOf(':') + 1);
}
bds.setDatabaseName(db);
bds.setUser(TestUtil.getUser()); bds.setUser(TestUtil.getUser());
bds.setPassword(TestUtil.getPassword()); bds.setPassword(TestUtil.getPassword());
} }

15
src/interfaces/jdbc/org/postgresql/test/jdbc2/optional/PoolingDataSourceTest.java
View File

@ -9,7 +9,7 @@ import org.postgresql.jdbc2.optional.BaseDataSource;
* Minimal tests for pooling DataSource. Needs many more. * Minimal tests for pooling DataSource. Needs many more.
* *
* @author Aaron Mulder (ammulder@chariotsolutions.com) * @author Aaron Mulder (ammulder@chariotsolutions.com)
* @version $Revision: 1.1 $ * @version $Revision: 1.1.6.1 $
*/ */
public class PoolingDataSourceTest extends BaseDataSourceTest public class PoolingDataSourceTest extends BaseDataSourceTest
{ {
@ -40,16 +40,9 @@ public class PoolingDataSourceTest extends BaseDataSourceTest
if (bds == null) if (bds == null)
{ {
bds = new PoolingDataSource(); bds = new PoolingDataSource();
String db = TestUtil.getURL(); bds.setServerName(TestUtil.getServer());
if (db.indexOf('/') > -1) bds.setPortNumber(TestUtil.getPort());
{ bds.setDatabaseName(TestUtil.getDatabase());
db = db.substring(db.lastIndexOf('/') + 1);
}
else if (db.indexOf(':') > -1)
{
db = db.substring(db.lastIndexOf(':') + 1);
}
bds.setDatabaseName(db);
bds.setUser(TestUtil.getUser()); bds.setUser(TestUtil.getUser());
bds.setPassword(TestUtil.getPassword()); bds.setPassword(TestUtil.getPassword());
((PoolingDataSource) bds).setDataSourceName(DS_NAME); ((PoolingDataSource) bds).setDataSourceName(DS_NAME);

15
src/interfaces/jdbc/org/postgresql/test/jdbc2/optional/SimpleDataSourceTest.java
View File

@ -8,7 +8,7 @@ import org.postgresql.jdbc2.optional.SimpleDataSource;
* configuration logic. * configuration logic.
* *
* @author Aaron Mulder (ammulder@chariotsolutions.com) * @author Aaron Mulder (ammulder@chariotsolutions.com)
* @version $Revision: 1.3 $ * @version $Revision: 1.3.6.1 $
*/ */
public class SimpleDataSourceTest extends BaseDataSourceTest public class SimpleDataSourceTest extends BaseDataSourceTest
{ {
@ -28,16 +28,9 @@ public class SimpleDataSourceTest extends BaseDataSourceTest
if (bds == null) if (bds == null)
{ {
bds = new SimpleDataSource(); bds = new SimpleDataSource();
String db = TestUtil.getURL(); bds.setServerName(TestUtil.getServer());
if (db.indexOf('/') > -1) bds.setPortNumber(TestUtil.getPort());
{ bds.setDatabaseName(TestUtil.getDatabase());
db = db.substring(db.lastIndexOf('/') + 1);
}
else if (db.indexOf(':') > -1)
{
db = db.substring(db.lastIndexOf(':') + 1);
}
bds.setDatabaseName(db);
bds.setUser(TestUtil.getUser()); bds.setUser(TestUtil.getUser());
bds.setPassword(TestUtil.getPassword()); bds.setPassword(TestUtil.getPassword());
} }

15
src/interfaces/jdbc/org/postgresql/test/jdbc3/Jdbc3ConnectionPoolTest.java
View File

@ -12,7 +12,7 @@ import javax.sql.PooledConnection;
* Tests JDBC3 implementation of ConnectionPoolDataSource. * Tests JDBC3 implementation of ConnectionPoolDataSource.
* *
* @author Aaron Mulder (ammulder@chariotsolutions.com) * @author Aaron Mulder (ammulder@chariotsolutions.com)
* @version $Revision: 1.2 $ * @version $Revision: 1.2.4.1 $
*/ */
public class Jdbc3ConnectionPoolTest extends ConnectionPoolTest public class Jdbc3ConnectionPoolTest extends ConnectionPoolTest
{ {
@ -29,16 +29,9 @@ public class Jdbc3ConnectionPoolTest extends ConnectionPoolTest
if (bds == null) if (bds == null)
{ {
bds = new Jdbc3ConnectionPool(); bds = new Jdbc3ConnectionPool();
String db = TestUtil.getURL(); bds.setServerName(TestUtil.getServer());
if (db.indexOf('/') > -1) bds.setPortNumber(TestUtil.getPort());
{ bds.setDatabaseName(TestUtil.getDatabase());
db = db.substring(db.lastIndexOf('/') + 1);
}
else if (db.indexOf(':') > -1)
{
db = db.substring(db.lastIndexOf(':') + 1);
}
bds.setDatabaseName(db);
bds.setUser(TestUtil.getUser()); bds.setUser(TestUtil.getUser());
bds.setPassword(TestUtil.getPassword()); bds.setPassword(TestUtil.getPassword());
} }

14
src/interfaces/jdbc/org/postgresql/test/jdbc3/Jdbc3PoolingDataSourceTest.java
View File

@ -13,7 +13,7 @@ import org.postgresql.jdbc2.optional.PoolingDataSource;
* Minimal tests for JDBC3 pooling DataSource. Needs many more. * Minimal tests for JDBC3 pooling DataSource. Needs many more.
* *
* @author Aaron Mulder (ammulder@chariotsolutions.com) * @author Aaron Mulder (ammulder@chariotsolutions.com)
* @version $Revision: 1.1 $ * @version $Revision: 1.1.6.1 $
*/ */
public class Jdbc3PoolingDataSourceTest extends PoolingDataSourceTest public class Jdbc3PoolingDataSourceTest extends PoolingDataSourceTest
{ {
@ -42,15 +42,9 @@ public class Jdbc3PoolingDataSourceTest extends PoolingDataSourceTest
private void configureDataSource(PoolingDataSource source) private void configureDataSource(PoolingDataSource source)
{ {
String db = TestUtil.getURL(); String db = TestUtil.getURL();
if (db.indexOf('/') > -1) source.setServerName(TestUtil.getServer());
{ source.setPortNumber(TestUtil.getPort());
db = db.substring(db.lastIndexOf('/') + 1); source.setDatabaseName(TestUtil.getDatabase());
}
else if (db.indexOf(':') > -1)
{
db = db.substring(db.lastIndexOf(':') + 1);
}
source.setDatabaseName(db);
source.setUser(TestUtil.getUser()); source.setUser(TestUtil.getUser());
source.setPassword(TestUtil.getPassword()); source.setPassword(TestUtil.getPassword());
source.setDataSourceName(DS_NAME); source.setDataSourceName(DS_NAME);

15
src/interfaces/jdbc/org/postgresql/test/jdbc3/Jdbc3SimpleDataSourceTest.java
View File

@ -10,7 +10,7 @@ import org.postgresql.jdbc3.*;
* Tests JDBC3 non-pooling DataSource. * Tests JDBC3 non-pooling DataSource.
* *
* @author Aaron Mulder (ammulder@chariotsolutions.com) * @author Aaron Mulder (ammulder@chariotsolutions.com)
* @version $Revision: 1.1 $ * @version $Revision: 1.1.6.1 $
*/ */
public class Jdbc3SimpleDataSourceTest extends SimpleDataSourceTest { public class Jdbc3SimpleDataSourceTest extends SimpleDataSourceTest {
/** /**
@ -29,16 +29,9 @@ public class Jdbc3SimpleDataSourceTest extends SimpleDataSourceTest {
if (bds == null) if (bds == null)
{ {
bds = new Jdbc3SimpleDataSource(); bds = new Jdbc3SimpleDataSource();
String db = TestUtil.getURL(); bds.setServerName(TestUtil.getServer());
if (db.indexOf('/') > -1) bds.setPortNumber(TestUtil.getPort());
{ bds.setDatabaseName(TestUtil.getDatabase());
db = db.substring(db.lastIndexOf('/') + 1);
}
else if (db.indexOf(':') > -1)
{
db = db.substring(db.lastIndexOf(':') + 1);
}
bds.setDatabaseName(db);
bds.setUser(TestUtil.getUser()); bds.setUser(TestUtil.getUser());
bds.setPassword(TestUtil.getPassword()); bds.setPassword(TestUtil.getPassword());
} }