1 files changed, 0 insertions, 266 deletions
diff --git a/src/interfaces/jdbc/org/postgresql/test/TestUtil.java b/src/interfaces/jdbc/org/postgresql/test/TestUtil.java
deleted file mode 100644
index 9ef0c7d899f..00000000000
--- a/src/interfaces/jdbc/org/postgresql/test/TestUtil.java
+++ /dev/null
@@ -1,266 +0,0 @@
-package org.postgresql.test;
-
-import java.sql.*;
-import junit.framework.TestCase;
-import java.util.Properties;
-
-/*
- * Utility class for JDBC tests
- */
-public class TestUtil
-{
-	/*
-	 * Returns the Test database JDBC URL
-	 */
-	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");
-	}
-
-	/*
-	 * Returns the Postgresql username
-	 */
-	public static String getUser()
-	{
-		return System.getProperty("username");
-	}
-
-	/*
-	 * Returns the user's password
-	 */
-	public static String getPassword()
-	{
-		return System.getProperty("password");
-	}
-
-	/*
-	 * Helper - opens a connection.
-	 */
-	public static java.sql.Connection openDB()
-	{
-		return openDB(new Properties());
-	}
-
-	/*
-	 * Helper - opens a connection with the allowance for passing
-	 * additional parameters, like "compatible".
-	 */
-	public static java.sql.Connection openDB(Properties props)
-	{
-		props.setProperty("user",getUser());
-		props.setProperty("password",getPassword());
-		try
-		{
-			Class.forName("org.postgresql.Driver");
-			return java.sql.DriverManager.getConnection(getURL(), props);
-		}
-		catch (ClassNotFoundException ex)
-		{
-			TestCase.fail(ex.getMessage());
-		}
-		catch (SQLException ex)
-		{
-			TestCase.fail(ex.getMessage());
-		}
-		return null;
-	}
-
-	/*
-	 * Helper - closes an open connection. This rewrites SQLException to a failed
-	 * assertion. It's static so other classes can use it.
-	 */
-	public static void closeDB(Connection con)
-	{
-		try
-		{
-			if (con != null)
-				con.close();
-		}
-		catch (SQLException ex)
-		{
-			TestCase.fail(ex.getMessage());
-		}
-	}
-
-	/*
-	 * Helper - creates a test table for use by a test
-	 */
-	public static void createTable(Connection con,
-								   String table,
-								   String columns)
-	{
-		try
-		{
-			Statement st = con.createStatement();
-			try
-			{
-				// Drop the table
-				dropTable(con, table);
-
-				// Now create the table
-				st.executeUpdate("create table " + table + " (" + columns + ")");
-			}
-			finally
-			{
-				st.close();
-			}
-		}
-		catch (SQLException ex)
-		{
-			TestCase.fail(ex.getMessage());
-		}
-	}
-
-	/*
-	 * Helper - drops a table
-	 */
-	public static void dropTable(Connection con, String table)
-	{
-		try
-		{
-			Statement stmt = con.createStatement();
-			try
-			{
-				String sql = "DROP TABLE " + table;
-				if (haveMinimumServerVersion(con,"7.3")) {
-					sql += " CASCADE ";
-				}
-				stmt.executeUpdate(sql);
-			}
-			catch (SQLException ex)
-			{
-				// Since every create table issues a drop table
-				// it's easy to get a table doesn't exist error.
-				// we want to ignore these, but if we're in a
-				// transaction we need to restart.
-				// If the test case wants to catch this error
-				// itself it should issue the drop SQL directly.
-				if (ex.getMessage().indexOf("does not exist") != -1) {
-					if (!con.getAutoCommit()) {
-						con.rollback();
-					}
-
-				}
-			}
-		}
-		catch (SQLException ex)
-		{
-			TestCase.fail(ex.getMessage());
-		}
-	}
-
-	/*
-	 * Helper - generates INSERT SQL - very simple
-	 */
-	public static String insertSQL(String table, String values)
-	{
-		return insertSQL(table, null, values);
-	}
-
-	public static String insertSQL(String table, String columns, String values)
-	{
-		String s = "INSERT INTO " + table;
-
-		if (columns != null)
-			s = s + " (" + columns + ")";
-
-		return s + " VALUES (" + values + ")";
-	}
-
-	/*
-	 * Helper - generates SELECT SQL - very simple
-	 */
-	public static String selectSQL(String table, String columns)
-	{
-		return selectSQL(table, columns, null, null);
-	}
-
-	public static String selectSQL(String table, String columns, String where)
-	{
-		return selectSQL(table, columns, where, null);
-	}
-
-	public static String selectSQL(String table, String columns, String where, String other)
-	{
-		String s = "SELECT " + columns + " FROM " + table;
-
-		if (where != null)
-			s = s + " WHERE " + where;
-		if (other != null)
-			s = s + " " + other;
-
-		return s;
-	}
-
-	/*
-	 * Helper to prefix a number with leading zeros - ugly but it works...
-	 * @param v value to prefix
-	 * @param l number of digits (0-10)
-	 */
-	public static String fix(int v, int l)
-	{
-		String s = "0000000000".substring(0, l) + Integer.toString(v);
-		return s.substring(s.length() - l);
-	}
-
-	/**
-	 * Determine if the given connection is connected to a server with
-	 * a version of at least the given version.
-	 * This is convenient because we are working with a java.sql.Connection,
-	 * not an Postgres connection.
-	 */
-	public static boolean haveMinimumServerVersion(Connection con, String version) throws SQLException {
-		if (con instanceof org.postgresql.jdbc1.AbstractJdbc1Connection) {
-			return ((org.postgresql.jdbc1.AbstractJdbc1Connection)con).haveMinimumServerVersion(version);
-		}
-		return false;
-	}
-
-	/**
-	 * Print a ResultSet to System.out.
-	 * This is useful for debugging tests.
-	 */
-	public static void printResultSet(ResultSet rs) throws SQLException {
-		ResultSetMetaData rsmd = rs.getMetaData();
-		for (int i=1; i<=rsmd.getColumnCount(); i++) {
-			if (i != 1) {
-				System.out.print(", ");
-			}
-			System.out.print(rsmd.getColumnName(i));
-		}
-		System.out.println();
-		while (rs.next()) {
-			for (int i=1; i<=rsmd.getColumnCount(); i++) {
-				if (i != 1) {
-					System.out.print(", ");
-				}
-				System.out.print(rs.getString(i));
-			}
-			System.out.println();
-		}
-	}
-}