From 4a752bd181647fab267bccd9ecff033f005b5e57 Mon Sep 17 00:00:00 2001 From: mrotteveel Date: Mon, 6 Aug 2012 12:56:23 +0000 Subject: [PATCH] JDBC-201: * Rename SimpleFBTestBase to FBTestProperties to better reflect its purpose * Move common factory methods from FBTestBase to FBTestProperties * Move DDL helper methods from FBTestBase to separate class (DdlHelper) * Move closeQuietly methods from FBTestBase to separate class (JdbcResourceHelper) --- .../org/firebirdsql/common/DdlHelper.java | 109 ++++++++ .../org/firebirdsql/common/FBTestBase.java | 240 +----------------- .../firebirdsql/common/FBTestProperties.java | 192 ++++++++++++++ .../common/JdbcResourceHelper.java | 107 ++++++++ .../firebirdsql/common/SimpleFBTestBase.java | 86 ------- .../ds/FBConnectionPoolTestBase.java | 6 +- .../firebirdsql/ds/TestFBXADataSource.java | 6 +- .../firebirdsql/event/TestFBEventManager.java | 2 +- .../gds/TestReconnectTransaction.java | 2 +- .../firebirdsql/gds/impl/jni/TestNgds.java | 2 +- .../gds/impl/jni/TestNgdsBlobReadBug.java | 2 +- .../firebirdsql/gds/impl/wire/TestGds.java | 2 +- .../jca/TestFBDatabaseMetaData.java | 2 +- .../org/firebirdsql/jca/TestFBTpbMapper.java | 6 +- .../org/firebirdsql/jca/TestFBXAResource.java | 2 + src/test/org/firebirdsql/jca/TestXABase.java | 2 +- .../firebirdsql/jdbc/FBMetaDataTestBase.java | 3 + .../jdbc/FBTestGeneratedKeysBase.java | 3 + .../org/firebirdsql/jdbc/TestBoundary.java | 3 + .../firebirdsql/jdbc/TestFBBlobStream.java | 2 + .../jdbc/TestFBCallableStatement.java | 2 + src/test/org/firebirdsql/jdbc/TestFBClob.java | 2 + .../firebirdsql/jdbc/TestFBConnection.java | 3 + .../jdbc/TestFBDatabaseMetaDataColumns.java | 2 + .../jdbc/TestFBDatabaseMetaDataIndexInfo.java | 2 + ...estFBDatabaseMetaDataProcedureColumns.java | 2 + .../TestFBDatabaseMetaDataProcedures.java | 2 + .../jdbc/TestFBDatabaseMetaDataTables.java | 2 + .../jdbc/TestFBDatabaseMetaDataUDTs.java | 2 + .../org/firebirdsql/jdbc/TestFBDriver.java | 2 + .../org/firebirdsql/jdbc/TestFBEncodings.java | 2 + .../jdbc/TestFBLongVarCharEncodings.java | 2 + .../jdbc/TestFBParameterMetaData.java | 10 +- .../jdbc/TestFBPreparedStatement.java | 4 + .../TestFBPreparedStatementGeneratedKeys.java | 2 + .../org/firebirdsql/jdbc/TestFBResultSet.java | 2 + .../jdbc/TestFBResultSetMetaData.java | 18 +- .../org/firebirdsql/jdbc/TestFBStatement.java | 3 + .../jdbc/TestFBStatementGeneratedKeys.java | 2 + .../jdbc/TestFBUnmanagedConnection.java | 4 + .../jdbc/TestFBWrappingDataSource.java | 2 +- .../jdbc/TestTableReservation.java | 1 + .../management/TestBackupManager.java | 3 +- .../management/TestFBMaintenanceManager.java | 2 +- .../firebirdsql/management/TestFBManager.java | 2 +- .../management/TestFBStatisticsManager.java | 2 +- .../management/TestUserManager.java | 2 +- .../TestDriverConnectionPoolDataSource.java | 2 + .../pool/TestFBConnectionPoolDataSource.java | 2 +- .../firebirdsql/pool/TestXADataSource.java | 2 + 50 files changed, 511 insertions(+), 358 deletions(-) create mode 100644 src/test/org/firebirdsql/common/DdlHelper.java create mode 100644 src/test/org/firebirdsql/common/FBTestProperties.java create mode 100644 src/test/org/firebirdsql/common/JdbcResourceHelper.java delete mode 100644 src/test/org/firebirdsql/common/SimpleFBTestBase.java diff --git a/src/test/org/firebirdsql/common/DdlHelper.java b/src/test/org/firebirdsql/common/DdlHelper.java new file mode 100644 index 0000000000..9a27b71cf7 --- /dev/null +++ b/src/test/org/firebirdsql/common/DdlHelper.java @@ -0,0 +1,109 @@ +/* + * $Id$ + * Firebird Open Source J2ee connector - jdbc driver + * + * Distributable under LGPL license. + * You may obtain a copy of the License at http://www.gnu.org/copyleft/lgpl.html + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * LGPL License for more details. + * + * This file was created by members of the firebird development team. + * All individual contributions remain the Copyright (C) of those + * individuals. Contributors to this file are either listed here or + * can be obtained from a CVS history command. + * + * All rights reserved. + */ +package org.firebirdsql.common; + +import java.sql.Connection; +import java.sql.SQLException; +import java.sql.Statement; + +import org.firebirdsql.gds.GDSException; +import org.firebirdsql.gds.ISCConstants; +import org.firebirdsql.gds.impl.GDSHelper; +import org.firebirdsql.jdbc.FBConnection; +import org.firebirdsql.jdbc.FBSQLException; + +/** + * Helper class for executing DDL while ignoring certain errors. + * + * @author Mark Rotteveel + */ +public final class DdlHelper { + + private DdlHelper() { + } + + public static void executeCreateTable(Connection connection, String sql) throws SQLException { + DdlHelper.executeDDL(connection, sql, new int[] { ISCConstants.isc_no_meta_update }); + } + + public static void executeDDL(Connection connection, String sql, int[] ignoreErrors) + throws SQLException { + try { + Statement stmt = connection.createStatement(); + try { + stmt.execute(sql); + } finally { + stmt.close(); + } + } catch (SQLException ex) { + if (ignoreErrors == null || ignoreErrors.length == 0) + throw ex; + + boolean ignoreException = false; + + int errorCode = ex.getErrorCode(); + Throwable current = ex; + errorcodeloop: do { + for (int i = 0; i < ignoreErrors.length; i++) { + if (ignoreErrors[i] == errorCode) { + ignoreException = true; + break errorcodeloop; + } + } + if (current instanceof GDSException) { + current = ((GDSException) current).getNext(); + } else { + current = current.getCause(); + } + if (current == null || !(current instanceof GDSException)) { + break; + } else { + errorCode = ((GDSException) current).getFbErrorCode(); + } + } while (errorCode != -1); + + if (!ignoreException) + throw ex; + } + } + + public static void executeDropTable(Connection connection, String sql) throws SQLException { + executeDDL(connection, sql, DdlHelper.getDropIgnoreErrors(connection)); + } + + private static int[] getDropIgnoreErrors(Connection connection) throws SQLException { + GDSHelper gdsHelper; + try { + gdsHelper = ((FBConnection) connection).getGDSHelper(); + if (gdsHelper.compareToVersion(2, 0) < 0) { + // Firebird 1.5 and earlier do not always return specific error + // codes + return new int[] { ISCConstants.isc_dsql_error, ISCConstants.isc_no_meta_update, + ISCConstants.isc_dsql_table_not_found, ISCConstants.isc_dsql_view_not_found }; + } else { + return new int[] { ISCConstants.isc_no_meta_update, + ISCConstants.isc_dsql_table_not_found, ISCConstants.isc_dsql_view_not_found }; + } + } catch (GDSException e) { + throw new FBSQLException(e); + } + } + +} diff --git a/src/test/org/firebirdsql/common/FBTestBase.java b/src/test/org/firebirdsql/common/FBTestBase.java index 3ce9ba164d..455fdfbbf4 100644 --- a/src/test/org/firebirdsql/common/FBTestBase.java +++ b/src/test/org/firebirdsql/common/FBTestBase.java @@ -19,31 +19,17 @@ package org.firebirdsql.common; import java.sql.*; -import java.util.*; -import javax.resource.spi.ConnectionManager; -import javax.sql.PooledConnection; import junit.framework.TestCase; -import org.firebirdsql.gds.GDSException; -import org.firebirdsql.gds.ISCConstants; -import org.firebirdsql.gds.impl.GDSHelper; import org.firebirdsql.gds.impl.GDSType; -import org.firebirdsql.jca.FBManagedConnectionFactory; -import org.firebirdsql.jca.InternalConnectionManager; -import org.firebirdsql.jdbc.FBConnection; -import org.firebirdsql.jdbc.FBDriver; -import org.firebirdsql.jdbc.FBSQLException; import org.firebirdsql.jdbc.FirebirdConnection; import org.firebirdsql.logging.Logger; import org.firebirdsql.logging.LoggerFactory; import org.firebirdsql.management.FBManager; -import org.firebirdsql.pool.AbstractFBConnectionPoolDataSource; -import org.firebirdsql.pool.FBPooledDataSourceFactory; -import org.firebirdsql.pool.FBWrappingDataSource; -import static org.firebirdsql.common.SimpleFBTestBase.*; +import static org.firebirdsql.common.FBTestProperties.*; /** * Base class for test cases which could be run against more then a single GDS @@ -53,154 +39,14 @@ public abstract class FBTestBase extends TestCase { protected final Logger log = LoggerFactory.getLogger(getClass(), true); - protected static final String DB_LC_CTYPE = getProperty("test.db.lc_ctype", "NONE"); - - protected final String DB_DATASOURCE_URL = getdbpath(DB_NAME); - protected FBTestBase(String name) { super(name); } - // FACTORY METHODS - // - // These methods should be used where possible so as to create the objects - // bound to the - // appropriate GDS implementation. - - protected AbstractFBConnectionPoolDataSource createFBConnectionPoolDataSource() - throws SQLException { - final AbstractFBConnectionPoolDataSource returnValue = FBPooledDataSourceFactory - .createFBConnectionPoolDataSource(); - - returnValue.setType(getGdsType().toString()); - - return returnValue; - } - - protected FBManagedConnectionFactory createFBManagedConnectionFactory() { - return new FBManagedConnectionFactory(getGdsType()); - } - - protected FBManagedConnectionFactory createFBManagedConnectionFactory( - ConnectionManager cm) { - FBManagedConnectionFactory mcf = new FBManagedConnectionFactory( - getGdsType()); - mcf.setDefaultConnectionManager(new InternalConnectionManager()); - return mcf; - } - - protected FBManager createFBManager() { - return new FBManager(getGdsType()); - } - - protected FBWrappingDataSource createFBWrappingDataSource() - throws SQLException { - final FBWrappingDataSource returnValue = new FBWrappingDataSource(); - - returnValue.setType(getGdsType().toString()); - - return returnValue; - } - - protected FirebirdConnection getConnectionViaDriverManager() throws SQLException { - try { - Class.forName(FBDriver.class.getName()); - } catch (ClassNotFoundException ex) { - throw new SQLException("No suitable driver."); - } - - return (FirebirdConnection)DriverManager.getConnection(getUrl(), - getDefaultPropertiesForConnection()); - } - - protected Properties getDefaultPropertiesForConnection() { - final Properties returnValue = new Properties(); - - returnValue.setProperty("user", DB_USER); - returnValue.setProperty("password", DB_PASSWORD); - returnValue.setProperty("lc_ctype", DB_LC_CTYPE); - - return returnValue; - } - - protected void executeCreateTable(Connection connection, String sql) throws SQLException { - executeDDL(connection, sql, new int[]{ISCConstants.isc_no_meta_update}); + protected final FirebirdConnection getConnectionViaDriverManager() throws SQLException { + return FBTestProperties.getConnectionViaDriverManager(); } - protected void executeDropTable(Connection connection, String sql) throws SQLException { - executeDDL(connection, sql, getDropIgnoreErrors(connection)); - } - - private int[] getDropIgnoreErrors(Connection connection) throws SQLException { - GDSHelper gdsHelper; - try { - gdsHelper = ((FBConnection)connection).getGDSHelper(); - if (gdsHelper.compareToVersion(2, 0) < 0) { - // Firebird 1.5 and earlier do not always return specific error codes - return new int[] {ISCConstants.isc_dsql_error, ISCConstants.isc_no_meta_update, ISCConstants.isc_dsql_table_not_found, ISCConstants.isc_dsql_view_not_found}; - } else { - return new int[]{ISCConstants.isc_no_meta_update, ISCConstants.isc_dsql_table_not_found, ISCConstants.isc_dsql_view_not_found}; - } - } catch (GDSException e) { - throw new FBSQLException(e); - } - } - - protected void executeDDL(Connection connection, String sql, int[] ignoreErrors) throws SQLException { - try { - Statement stmt = connection.createStatement(); - try { - stmt.execute(sql); - } finally { - stmt.close(); - } - } catch(SQLException ex) { - if (ignoreErrors == null || ignoreErrors.length == 0) - throw ex; - - boolean ignoreException = false; - - int errorCode = ex.getErrorCode(); - Throwable current = ex; - errorcodeloop: do { - for (int i = 0; i < ignoreErrors.length; i++) { - if (ignoreErrors[i] == errorCode) { - ignoreException = true; - break errorcodeloop; - } - } - if (current instanceof GDSException) { - current = ((GDSException)current).getNext(); - } else { - current = current.getCause(); - } - if (current == null || !(current instanceof GDSException)) { - break; - } else { - errorCode = ((GDSException)current).getFbErrorCode(); - } - } while (errorCode != -1); - - if (!ignoreException) - throw ex; - } - } - - // USEFULL PROPERTY GETTERS - - protected String getUrl() { - return gdsTypeToUrlPrefixMap.get(getGdsType()) + getdbpath(DB_NAME); - } - - protected GDSType getGdsType() { - final GDSType gdsType = GDSType.getType(getProperty("test.gds_type", "PURE_JAVA")); - if (gdsType == null) - throw new RuntimeException( - "Unrecoginzed value for 'test.gds_type' property."); - - return gdsType; - } - // STANDARD RIG protected void setUp() throws Exception { @@ -223,84 +69,4 @@ protected void tearDown() throws Exception { } protected FBManager fbManager = null; - - private static final Map gdsTypeToUrlPrefixMap = new HashMap(); - static { - gdsTypeToUrlPrefixMap.put(GDSType.getType("PURE_JAVA"), - "jdbc:firebirdsql:"); - gdsTypeToUrlPrefixMap.put(GDSType.getType("EMBEDDED"), - "jdbc:firebirdsql:embedded:"); - gdsTypeToUrlPrefixMap.put(GDSType.getType("NATIVE"), - "jdbc:firebirdsql:native:"); - gdsTypeToUrlPrefixMap.put(GDSType.getType("ORACLE_MODE"), - "jdbc:firebirdsql:oracle:"); - gdsTypeToUrlPrefixMap.put(GDSType.getType("LOCAL"), - "jdbc:firebirdsql:local:"); - gdsTypeToUrlPrefixMap.put(GDSType.getType("NIO"), - "jdbc:firebirdsql:nio:"); - } - - /** - * Helper method to quietly close statements. - * - * @param stmt Statement object - */ - protected void closeQuietly(Statement stmt) { - if (stmt == null) { - return; - } - try { - stmt.close(); - } catch (SQLException ex) { - //ignore - } - } - - /** - * Helper method to quietly close connections. - * - * @param con Connection object - */ - protected void closeQuietly(Connection con) { - if (con == null) { - return; - } - try { - con.close(); - } catch (SQLException ex) { - //ignore - } - } - - /** - * Helper method to quietly close resultsets. - * - * @param rs ResultSet object - */ - protected void closeQuietly(ResultSet rs) { - if (rs == null) { - return; - } - try { - rs.close(); - } catch (SQLException ex) { - //ignore - } - } - - /** - * Helper method to quietly close pooled connections. - * - * @param con PooledConnection object - */ - protected void closeQuietly(PooledConnection con) { - if (con == null) { - return; - } - try { - con.close(); - } catch (SQLException ex) { - //ignore - } - } } diff --git a/src/test/org/firebirdsql/common/FBTestProperties.java b/src/test/org/firebirdsql/common/FBTestProperties.java new file mode 100644 index 0000000000..9924828592 --- /dev/null +++ b/src/test/org/firebirdsql/common/FBTestProperties.java @@ -0,0 +1,192 @@ +/* + * $Id$ + * Firebird Open Source J2ee connector - jdbc driver + * + * Distributable under LGPL license. + * You may obtain a copy of the License at http://www.gnu.org/copyleft/lgpl.html + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * LGPL License for more details. + * + * This file was created by members of the firebird development team. + * All individual contributions remain the Copyright (C) of those + * individuals. Contributors to this file are either listed here or + * can be obtained from a CVS history command. + * + * All rights reserved. + */ +package org.firebirdsql.common; + +import java.io.File; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.util.HashMap; +import java.util.Map; +import java.util.MissingResourceException; +import java.util.Properties; +import java.util.ResourceBundle; + +import javax.resource.spi.ConnectionManager; + +import org.firebirdsql.gds.impl.GDSType; +import org.firebirdsql.jca.FBManagedConnectionFactory; +import org.firebirdsql.jca.InternalConnectionManager; +import org.firebirdsql.jdbc.FBDriver; +import org.firebirdsql.jdbc.FirebirdConnection; +import org.firebirdsql.management.FBManager; +import org.firebirdsql.pool.AbstractFBConnectionPoolDataSource; +import org.firebirdsql.pool.FBPooledDataSourceFactory; +import org.firebirdsql.pool.FBWrappingDataSource; + +/** + * Helper class for test properties (database user, password, paths etc) + */ +public final class FBTestProperties { + private static ResourceBundle testDefaults = ResourceBundle.getBundle("unit_test_defaults"); + + public static String getProperty(String property) { + return getProperty(property, null); + } + + public static String getProperty(String property, String defaultValue) { + try { + return System.getProperty(property, testDefaults.getString(property)); + } catch (MissingResourceException ex) { + return System.getProperty(property, defaultValue); + } + } + + /** + * Default name of database file to use for the test case. + */ + public static final String DB_NAME = "fbtest.fdb"; + public static final String DB_USER = getProperty("test.user", "sysdba"); + public static final String DB_PASSWORD = getProperty("test.password", "masterkey"); + public static final String DB_PATH = getProperty("test.db.dir", ""); + public static final String DB_SERVER_URL = getProperty("test.db.host", "localhost"); + public static final int DB_SERVER_PORT = Integer.parseInt(getProperty("test.db.port", "3050")); + public static final String DB_LC_CTYPE = getProperty("test.db.lc_ctype", "NONE"); + public static final String DB_DATASOURCE_URL = getdbpath(DB_NAME); + + public static String getDatabasePath() { + return getDatabasePath(DB_NAME); + } + + public static String getDatabasePath(String name) { + if (!"127.0.0.1".equals(DB_SERVER_URL) && !"localhost".equals(DB_SERVER_URL)) + return DB_PATH + "/" + name; + else + return new File(DB_PATH, name).getAbsolutePath(); + } + + /** + * Builds a firebird database connection string for the supplied database + * file. + * + * @param name + * @return + */ + public static String getdbpath(String name) { + final String gdsType = getProperty("test.gds_type", null); + if ("EMBEDDED".equalsIgnoreCase(gdsType) || "LOCAL".equalsIgnoreCase(gdsType)) { + return new File(DB_PATH, name).getAbsolutePath(); + } else { + return DB_SERVER_URL + "/" + DB_SERVER_PORT + ":" + getDatabasePath(name); + } + } + + /** + * @return Default database connection properties for this testrun + */ + public static Properties getDefaultPropertiesForConnection() { + final Properties returnValue = new Properties(); + + returnValue.setProperty("user", DB_USER); + returnValue.setProperty("password", DB_PASSWORD); + returnValue.setProperty("lc_ctype", DB_LC_CTYPE); + + return returnValue; + } + + /** + * @return {@link GDSType} for this testrun + */ + public static GDSType getGdsType() { + final GDSType gdsType = GDSType.getType(getProperty("test.gds_type", "PURE_JAVA")); + if (gdsType == null) { + throw new RuntimeException("Unrecognized value for 'test.gds_type' property."); + } + return gdsType; + } + + private static final Map gdsTypeToUrlPrefixMap = new HashMap(); + static { + gdsTypeToUrlPrefixMap.put(GDSType.getType("PURE_JAVA"), "jdbc:firebirdsql:"); + gdsTypeToUrlPrefixMap.put(GDSType.getType("EMBEDDED"), "jdbc:firebirdsql:embedded:"); + gdsTypeToUrlPrefixMap.put(GDSType.getType("NATIVE"), "jdbc:firebirdsql:native:"); + gdsTypeToUrlPrefixMap.put(GDSType.getType("ORACLE_MODE"), "jdbc:firebirdsql:oracle:"); + gdsTypeToUrlPrefixMap.put(GDSType.getType("LOCAL"), "jdbc:firebirdsql:local:"); + gdsTypeToUrlPrefixMap.put(GDSType.getType("NIO"), "jdbc:firebirdsql:nio:"); + } + + /** + * @return JDBC URL (without parameters) for this testrun + */ + public static String getUrl() { + return gdsTypeToUrlPrefixMap.get(getGdsType()) + getdbpath(DB_NAME); + } + + // FACTORY METHODS + // + // These methods should be used where possible so as to create the objects + // bound to the + // appropriate GDS implementation. + + public static AbstractFBConnectionPoolDataSource createFBConnectionPoolDataSource() + throws SQLException { + final AbstractFBConnectionPoolDataSource returnValue = FBPooledDataSourceFactory + .createFBConnectionPoolDataSource(); + + returnValue.setType(getGdsType().toString()); + + return returnValue; + } + + public static FBManagedConnectionFactory createFBManagedConnectionFactory() { + return new FBManagedConnectionFactory(getGdsType()); + } + + public static FBManagedConnectionFactory createFBManagedConnectionFactory(ConnectionManager cm) { + FBManagedConnectionFactory mcf = new FBManagedConnectionFactory(getGdsType()); + mcf.setDefaultConnectionManager(new InternalConnectionManager()); + return mcf; + } + + public static FBManager createFBManager() { + return new FBManager(getGdsType()); + } + + public static FBWrappingDataSource createFBWrappingDataSource() throws SQLException { + final FBWrappingDataSource returnValue = new FBWrappingDataSource(); + + returnValue.setType(getGdsType().toString()); + + return returnValue; + } + + public static FirebirdConnection getConnectionViaDriverManager() throws SQLException { + try { + Class.forName(FBDriver.class.getName()); + } catch (ClassNotFoundException ex) { + throw new SQLException("No suitable driver."); + } + + return (FirebirdConnection) DriverManager.getConnection(getUrl(), + getDefaultPropertiesForConnection()); + } + + private FBTestProperties() { + } +} diff --git a/src/test/org/firebirdsql/common/JdbcResourceHelper.java b/src/test/org/firebirdsql/common/JdbcResourceHelper.java new file mode 100644 index 0000000000..a99ba7e15a --- /dev/null +++ b/src/test/org/firebirdsql/common/JdbcResourceHelper.java @@ -0,0 +1,107 @@ +/* + * $Id$ + * Firebird Open Source J2ee connector - jdbc driver + * + * Distributable under LGPL license. + * You may obtain a copy of the License at http://www.gnu.org/copyleft/lgpl.html + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * LGPL License for more details. + * + * This file was created by members of the firebird development team. + * All individual contributions remain the Copyright (C) of those + * individuals. Contributors to this file are either listed here or + * can be obtained from a CVS history command. + * + * All rights reserved. + */ +package org.firebirdsql.common; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; + +import javax.sql.PooledConnection; + +/** + * Helper class for closing JDBC resources, ignoring all SQLExceptions. + * + * @author Mark Rotteveel + */ +public final class JdbcResourceHelper { + + private JdbcResourceHelper() { + } + + /** + * Helper method to quietly close statements. + * + * @param stmt + * Statement object + */ + public static void closeQuietly(Statement stmt) { + if (stmt == null) { + return; + } + try { + stmt.close(); + } catch (SQLException ex) { + // ignore + } + } + + /** + * Helper method to quietly close connections. + * + * @param con + * Connection object + */ + public static void closeQuietly(Connection con) { + if (con == null) { + return; + } + try { + con.close(); + } catch (SQLException ex) { + // ignore + } + } + + /** + * Helper method to quietly close resultsets. + * + * @param rs + * ResultSet object + */ + public static void closeQuietly(ResultSet rs) { + if (rs == null) { + return; + } + try { + rs.close(); + } catch (SQLException ex) { + // ignore + } + } + + /** + * Helper method to quietly close pooled connections. + * + * @param con + * PooledConnection object + */ + public static void closeQuietly(PooledConnection con) { + if (con == null) { + return; + } + try { + con.close(); + } catch (SQLException ex) { + // ignore + } + } + +} diff --git a/src/test/org/firebirdsql/common/SimpleFBTestBase.java b/src/test/org/firebirdsql/common/SimpleFBTestBase.java deleted file mode 100644 index f496776e07..0000000000 --- a/src/test/org/firebirdsql/common/SimpleFBTestBase.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * $Id$ - * Firebird Open Source J2ee connector - jdbc driver - * - * Distributable under LGPL license. - * You may obtain a copy of the License at http://www.gnu.org/copyleft/lgpl.html - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * LGPL License for more details. - * - * This file was created by members of the firebird development team. - * All individual contributions remain the Copyright (C) of those - * individuals. Contributors to this file are either listed here or - * can be obtained from a CVS history command. - * - * All rights reserved. - */ -package org.firebirdsql.common; - -import java.io.File; -import java.util.MissingResourceException; -import java.util.ResourceBundle; - -/** - * Helper class for test properties (database user, password, paths etc) - */ -public final class SimpleFBTestBase { - private static ResourceBundle testDefaults = ResourceBundle.getBundle("unit_test_defaults"); - - public static String getProperty(String property) { - return getProperty(property, null); - } - - public static String getProperty(String property, String defaultValue) { - try { - return System.getProperty(property, testDefaults.getString(property)); - } catch (MissingResourceException ex) { - return System.getProperty(property, defaultValue); - } - } - - /** - * Default name of database file to use for the test case. - */ - public static final String DB_NAME = "fbtest.fdb"; - - public static final String DB_USER = getProperty("test.user", "sysdba"); - public static final String DB_PASSWORD = getProperty("test.password", "masterkey"); - - public static final String DB_PATH = getProperty("test.db.dir", ""); - public static final String DB_SERVER_URL = getProperty("test.db.host", "localhost"); - public static final int DB_SERVER_PORT = Integer.parseInt(getProperty("test.db.port", "3050")); - - public static String getDatabasePath() { - return getDatabasePath(DB_NAME); - } - - public static String getDatabasePath(String name) { - if (!"127.0.0.1".equals(DB_SERVER_URL) && !"localhost".equals(DB_SERVER_URL)) - return DB_PATH + "/" + name; - else - return new File(DB_PATH, name).getAbsolutePath(); - } - - - /** - * Builds an firebird database connection string for the supplied database - * file. - * - * @param name - * @return - */ - public static String getdbpath(String name) { - final String gdsType = getProperty("test.gds_type", null); - if ("EMBEDDED".equalsIgnoreCase(gdsType) || "LOCAL".equalsIgnoreCase(gdsType)) { - return new File(DB_PATH, name).getAbsolutePath(); - } else { - return DB_SERVER_URL + "/" + DB_SERVER_PORT + ":" + getDatabasePath(name); - } - } - - private SimpleFBTestBase() { - } -} diff --git a/src/test/org/firebirdsql/ds/FBConnectionPoolTestBase.java b/src/test/org/firebirdsql/ds/FBConnectionPoolTestBase.java index 455023a247..378a4e7652 100644 --- a/src/test/org/firebirdsql/ds/FBConnectionPoolTestBase.java +++ b/src/test/org/firebirdsql/ds/FBConnectionPoolTestBase.java @@ -28,10 +28,10 @@ import javax.sql.PooledConnection; import org.firebirdsql.common.FBTestBase; -import org.firebirdsql.common.SimpleFBTestBase; import org.firebirdsql.gds.impl.GDSType; -import static org.firebirdsql.common.SimpleFBTestBase.*; +import static org.firebirdsql.common.JdbcResourceHelper.*; +import static org.firebirdsql.common.FBTestProperties.*; /** * Common testbase for tests using {@link FBConnectionPoolDataSource} @@ -50,7 +50,7 @@ public void setUp() throws Exception { super.setUp(); FBConnectionPoolDataSource newDs = new FBConnectionPoolDataSource(); - newDs.setType(SimpleFBTestBase.getProperty("test.gds_type", null)); + newDs.setType(getProperty("test.gds_type", null)); if (getGdsType() == GDSType.getType("PURE_JAVA") || getGdsType() == GDSType.getType("NATIVE")) { newDs.setServerName(DB_SERVER_URL); diff --git a/src/test/org/firebirdsql/ds/TestFBXADataSource.java b/src/test/org/firebirdsql/ds/TestFBXADataSource.java index dcea9d6fa7..0af31107aa 100644 --- a/src/test/org/firebirdsql/ds/TestFBXADataSource.java +++ b/src/test/org/firebirdsql/ds/TestFBXADataSource.java @@ -34,12 +34,12 @@ import javax.transaction.xa.Xid; import org.firebirdsql.common.FBTestBase; -import org.firebirdsql.common.SimpleFBTestBase; import org.firebirdsql.gds.impl.GDSType; import org.firebirdsql.jca.TestXABase.XidImpl; import org.firebirdsql.jdbc.FBSQLException; -import static org.firebirdsql.common.SimpleFBTestBase.*; +import static org.firebirdsql.common.JdbcResourceHelper.*; +import static org.firebirdsql.common.FBTestProperties.*; /** * Test for XADataSource. Note behavior of XAResource (ManagedConnection) is tested in {@link org.firebirdsql.jca.TestFBXAResource}. @@ -61,7 +61,7 @@ public void setUp() throws Exception { super.setUp(); FBXADataSource newDs = new FBXADataSource(); - newDs.setType(SimpleFBTestBase.getProperty("test.gds_type", null)); + newDs.setType(getProperty("test.gds_type", null)); if (getGdsType() == GDSType.getType("PURE_JAVA") || getGdsType() == GDSType.getType("NATIVE")) { newDs.setServerName(DB_SERVER_URL); diff --git a/src/test/org/firebirdsql/event/TestFBEventManager.java b/src/test/org/firebirdsql/event/TestFBEventManager.java index 2f3cf946c3..40e4fbdb8e 100644 --- a/src/test/org/firebirdsql/event/TestFBEventManager.java +++ b/src/test/org/firebirdsql/event/TestFBEventManager.java @@ -6,7 +6,7 @@ import org.firebirdsql.common.FBTestBase; import org.firebirdsql.gds.impl.GDSType; -import static org.firebirdsql.common.SimpleFBTestBase.*; +import static org.firebirdsql.common.FBTestProperties.*; /** * Test the FBEventManager class diff --git a/src/test/org/firebirdsql/gds/TestReconnectTransaction.java b/src/test/org/firebirdsql/gds/TestReconnectTransaction.java index aa753e5009..9000c4870d 100644 --- a/src/test/org/firebirdsql/gds/TestReconnectTransaction.java +++ b/src/test/org/firebirdsql/gds/TestReconnectTransaction.java @@ -10,7 +10,7 @@ import org.firebirdsql.jdbc.field.FBField; import org.firebirdsql.jdbc.field.FieldDataProvider; -import static org.firebirdsql.common.SimpleFBTestBase.*; +import static org.firebirdsql.common.FBTestProperties.*; /** * diff --git a/src/test/org/firebirdsql/gds/impl/jni/TestNgds.java b/src/test/org/firebirdsql/gds/impl/jni/TestNgds.java index 20357453a4..4fbba6afbd 100644 --- a/src/test/org/firebirdsql/gds/impl/jni/TestNgds.java +++ b/src/test/org/firebirdsql/gds/impl/jni/TestNgds.java @@ -38,7 +38,7 @@ import org.firebirdsql.logging.Logger; import org.firebirdsql.logging.LoggerFactory; -import static org.firebirdsql.common.SimpleFBTestBase.*; +import static org.firebirdsql.common.FBTestProperties.*; /** * Performs basic low level tests of the ngds package. diff --git a/src/test/org/firebirdsql/gds/impl/jni/TestNgdsBlobReadBug.java b/src/test/org/firebirdsql/gds/impl/jni/TestNgdsBlobReadBug.java index 7718b003f9..e3a91b0473 100644 --- a/src/test/org/firebirdsql/gds/impl/jni/TestNgdsBlobReadBug.java +++ b/src/test/org/firebirdsql/gds/impl/jni/TestNgdsBlobReadBug.java @@ -44,7 +44,7 @@ import org.firebirdsql.logging.Logger; import org.firebirdsql.logging.LoggerFactory; -import static org.firebirdsql.common.SimpleFBTestBase.*; +import static org.firebirdsql.common.FBTestProperties.*; /** * Performs test to reproduce bug found in blob reading done by type 2 driver. diff --git a/src/test/org/firebirdsql/gds/impl/wire/TestGds.java b/src/test/org/firebirdsql/gds/impl/wire/TestGds.java index a5aee088f2..31c689bf90 100644 --- a/src/test/org/firebirdsql/gds/impl/wire/TestGds.java +++ b/src/test/org/firebirdsql/gds/impl/wire/TestGds.java @@ -32,7 +32,7 @@ import org.firebirdsql.gds.impl.wire.isc_stmt_handle_impl; import org.firebirdsql.jca.FBTpb; -import static org.firebirdsql.common.SimpleFBTestBase.*; +import static org.firebirdsql.common.FBTestProperties.*; /** * @author Alejandro diff --git a/src/test/org/firebirdsql/jca/TestFBDatabaseMetaData.java b/src/test/org/firebirdsql/jca/TestFBDatabaseMetaData.java index ced8394a93..b0d517f01f 100644 --- a/src/test/org/firebirdsql/jca/TestFBDatabaseMetaData.java +++ b/src/test/org/firebirdsql/jca/TestFBDatabaseMetaData.java @@ -30,7 +30,7 @@ import org.firebirdsql.jdbc.*; -import static org.firebirdsql.common.SimpleFBTestBase.*; +import static org.firebirdsql.common.FBTestProperties.*; /** * Describe class TestFBDatabaseMetaData here. diff --git a/src/test/org/firebirdsql/jca/TestFBTpbMapper.java b/src/test/org/firebirdsql/jca/TestFBTpbMapper.java index d12694fd86..0461b3f341 100644 --- a/src/test/org/firebirdsql/jca/TestFBTpbMapper.java +++ b/src/test/org/firebirdsql/jca/TestFBTpbMapper.java @@ -18,7 +18,6 @@ */ package org.firebirdsql.jca; - import java.sql.Connection; import org.firebirdsql.gds.ISCConstants; @@ -27,6 +26,8 @@ import org.firebirdsql.common.FBTestBase; +import static org.firebirdsql.common.FBTestProperties.*; + /** * Roman Rokytskyy */ @@ -44,9 +45,8 @@ public TestFBTpbMapper(String string) { protected void setUp() throws Exception { super.setUp(); - mcf = super.createFBManagedConnectionFactory();//new FBManagedConnectionFactory(); + mcf = createFBManagedConnectionFactory(); } - /** * Test if default isolation level is Connection.TRANSACTION_READ_COMMITTED diff --git a/src/test/org/firebirdsql/jca/TestFBXAResource.java b/src/test/org/firebirdsql/jca/TestFBXAResource.java index 4dcef205c7..ba6644be50 100644 --- a/src/test/org/firebirdsql/jca/TestFBXAResource.java +++ b/src/test/org/firebirdsql/jca/TestFBXAResource.java @@ -28,6 +28,8 @@ import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; +import static org.firebirdsql.common.FBTestProperties.*; + /** * Describe class TestFBXAResource here. * diff --git a/src/test/org/firebirdsql/jca/TestXABase.java b/src/test/org/firebirdsql/jca/TestXABase.java index fa22363c9e..9cad6b70af 100644 --- a/src/test/org/firebirdsql/jca/TestXABase.java +++ b/src/test/org/firebirdsql/jca/TestXABase.java @@ -26,7 +26,7 @@ import org.firebirdsql.common.FBTestBase; -import static org.firebirdsql.common.SimpleFBTestBase.*; +import static org.firebirdsql.common.FBTestProperties.*; /** * THIS FILE INCLUDES AN XID IMPLEMENTATION FROM THE JBOSS PROJECT diff --git a/src/test/org/firebirdsql/jdbc/FBMetaDataTestBase.java b/src/test/org/firebirdsql/jdbc/FBMetaDataTestBase.java index 117275a53c..10831764e6 100644 --- a/src/test/org/firebirdsql/jdbc/FBMetaDataTestBase.java +++ b/src/test/org/firebirdsql/jdbc/FBMetaDataTestBase.java @@ -32,6 +32,9 @@ import org.firebirdsql.common.FBTestBase; import org.firebirdsql.jdbc.MetaDataValidator.MetaDataInfo; +import static org.firebirdsql.common.DdlHelper.*; +import static org.firebirdsql.common.JdbcResourceHelper.*; + /** * Base test class for testing and validating the various DatabaseMetaData * methods returning a ResultSet. diff --git a/src/test/org/firebirdsql/jdbc/FBTestGeneratedKeysBase.java b/src/test/org/firebirdsql/jdbc/FBTestGeneratedKeysBase.java index c421a8514d..8e7dd1b016 100644 --- a/src/test/org/firebirdsql/jdbc/FBTestGeneratedKeysBase.java +++ b/src/test/org/firebirdsql/jdbc/FBTestGeneratedKeysBase.java @@ -24,6 +24,9 @@ import org.firebirdsql.common.FBTestBase; +import static org.firebirdsql.common.DdlHelper.*; +import static org.firebirdsql.common.JdbcResourceHelper.*; + /** * Test base for tests of retrieval of auto generated keys. *

diff --git a/src/test/org/firebirdsql/jdbc/TestBoundary.java b/src/test/org/firebirdsql/jdbc/TestBoundary.java index 67cfe61485..a5e1c79c5f 100644 --- a/src/test/org/firebirdsql/jdbc/TestBoundary.java +++ b/src/test/org/firebirdsql/jdbc/TestBoundary.java @@ -6,6 +6,9 @@ import org.firebirdsql.common.FBTestBase; +import static org.firebirdsql.common.DdlHelper.*; +import static org.firebirdsql.common.JdbcResourceHelper.*; + public class TestBoundary extends FBTestBase { private static final String CREATE_META_ONE = diff --git a/src/test/org/firebirdsql/jdbc/TestFBBlobStream.java b/src/test/org/firebirdsql/jdbc/TestFBBlobStream.java index d7de67af0b..5666eb7b96 100644 --- a/src/test/org/firebirdsql/jdbc/TestFBBlobStream.java +++ b/src/test/org/firebirdsql/jdbc/TestFBBlobStream.java @@ -27,6 +27,8 @@ import java.util.Properties; import java.util.Random; +import static org.firebirdsql.common.FBTestProperties.*; + /** * Describe class TestFBBlobAccess here. * diff --git a/src/test/org/firebirdsql/jdbc/TestFBCallableStatement.java b/src/test/org/firebirdsql/jdbc/TestFBCallableStatement.java index 64656b78cb..028fc4e0d8 100644 --- a/src/test/org/firebirdsql/jdbc/TestFBCallableStatement.java +++ b/src/test/org/firebirdsql/jdbc/TestFBCallableStatement.java @@ -22,6 +22,8 @@ import java.sql.*; +import static org.firebirdsql.common.JdbcResourceHelper.*; + /** * This test case checks callable statements by executing procedure through * {@link java.sql.CallableStatement} and {@link java.sql.PreparedStatement}. diff --git a/src/test/org/firebirdsql/jdbc/TestFBClob.java b/src/test/org/firebirdsql/jdbc/TestFBClob.java index 93f4173060..f3d46a1db2 100644 --- a/src/test/org/firebirdsql/jdbc/TestFBClob.java +++ b/src/test/org/firebirdsql/jdbc/TestFBClob.java @@ -35,6 +35,8 @@ import org.firebirdsql.common.FBTestBase; +import static org.firebirdsql.common.FBTestProperties.*; + public class TestFBClob extends FBTestBase { private static final String PLAIN_BLOB = "plain_blob"; diff --git a/src/test/org/firebirdsql/jdbc/TestFBConnection.java b/src/test/org/firebirdsql/jdbc/TestFBConnection.java index 565a8099cf..6e78760d11 100644 --- a/src/test/org/firebirdsql/jdbc/TestFBConnection.java +++ b/src/test/org/firebirdsql/jdbc/TestFBConnection.java @@ -25,6 +25,9 @@ import org.firebirdsql.gds.*; import org.firebirdsql.jca.FBManagedConnection; +import static org.firebirdsql.common.JdbcResourceHelper.*; +import static org.firebirdsql.common.FBTestProperties.*; + /** * Test cases for FirebirdConnection interface. * diff --git a/src/test/org/firebirdsql/jdbc/TestFBDatabaseMetaDataColumns.java b/src/test/org/firebirdsql/jdbc/TestFBDatabaseMetaDataColumns.java index 65b1c04292..a3a6a91f72 100644 --- a/src/test/org/firebirdsql/jdbc/TestFBDatabaseMetaDataColumns.java +++ b/src/test/org/firebirdsql/jdbc/TestFBDatabaseMetaDataColumns.java @@ -34,6 +34,8 @@ import org.firebirdsql.jdbc.MetaDataValidator.MetaDataInfo; +import static org.firebirdsql.common.JdbcResourceHelper.*; + /** * Tests for {@link FBDatabaseMetaData} for column related metadata. * diff --git a/src/test/org/firebirdsql/jdbc/TestFBDatabaseMetaDataIndexInfo.java b/src/test/org/firebirdsql/jdbc/TestFBDatabaseMetaDataIndexInfo.java index e56101baa7..d79194aaf0 100644 --- a/src/test/org/firebirdsql/jdbc/TestFBDatabaseMetaDataIndexInfo.java +++ b/src/test/org/firebirdsql/jdbc/TestFBDatabaseMetaDataIndexInfo.java @@ -31,6 +31,8 @@ import org.firebirdsql.jdbc.MetaDataValidator.MetaDataInfo; +import static org.firebirdsql.common.JdbcResourceHelper.*; + /** * Tests for {@link FBDatabaseMetaData} for index info related metadata. * diff --git a/src/test/org/firebirdsql/jdbc/TestFBDatabaseMetaDataProcedureColumns.java b/src/test/org/firebirdsql/jdbc/TestFBDatabaseMetaDataProcedureColumns.java index 0fdc37e9bd..fe7dfb271a 100644 --- a/src/test/org/firebirdsql/jdbc/TestFBDatabaseMetaDataProcedureColumns.java +++ b/src/test/org/firebirdsql/jdbc/TestFBDatabaseMetaDataProcedureColumns.java @@ -32,6 +32,8 @@ import org.firebirdsql.jdbc.MetaDataValidator.MetaDataInfo; +import static org.firebirdsql.common.JdbcResourceHelper.*; + /** * Tests for {@link FBDatabaseMetaData} for procedure columns related metadata. * diff --git a/src/test/org/firebirdsql/jdbc/TestFBDatabaseMetaDataProcedures.java b/src/test/org/firebirdsql/jdbc/TestFBDatabaseMetaDataProcedures.java index 4d4a61af79..d61da7b776 100644 --- a/src/test/org/firebirdsql/jdbc/TestFBDatabaseMetaDataProcedures.java +++ b/src/test/org/firebirdsql/jdbc/TestFBDatabaseMetaDataProcedures.java @@ -31,6 +31,8 @@ import org.firebirdsql.jdbc.MetaDataValidator.MetaDataInfo; +import static org.firebirdsql.common.JdbcResourceHelper.*; + /** * Tests for {@link FBDatabaseMetaData} for procedure related metadata. * diff --git a/src/test/org/firebirdsql/jdbc/TestFBDatabaseMetaDataTables.java b/src/test/org/firebirdsql/jdbc/TestFBDatabaseMetaDataTables.java index 119ee7e22a..43f3f18742 100644 --- a/src/test/org/firebirdsql/jdbc/TestFBDatabaseMetaDataTables.java +++ b/src/test/org/firebirdsql/jdbc/TestFBDatabaseMetaDataTables.java @@ -31,6 +31,8 @@ import org.firebirdsql.jdbc.MetaDataValidator.MetaDataInfo; +import static org.firebirdsql.common.JdbcResourceHelper.*; + /** * Tests for {@link FBDatabaseMetaData} for table related metadata. * diff --git a/src/test/org/firebirdsql/jdbc/TestFBDatabaseMetaDataUDTs.java b/src/test/org/firebirdsql/jdbc/TestFBDatabaseMetaDataUDTs.java index 8d51324511..2b7680f9b3 100644 --- a/src/test/org/firebirdsql/jdbc/TestFBDatabaseMetaDataUDTs.java +++ b/src/test/org/firebirdsql/jdbc/TestFBDatabaseMetaDataUDTs.java @@ -27,6 +27,8 @@ import org.firebirdsql.jdbc.MetaDataValidator.MetaDataInfo; +import static org.firebirdsql.common.JdbcResourceHelper.*; + /** * Tests for {@link FBDatabaseMetaData} for UDT related metadata. * diff --git a/src/test/org/firebirdsql/jdbc/TestFBDriver.java b/src/test/org/firebirdsql/jdbc/TestFBDriver.java index 7b28bab2cf..bd36819c0f 100644 --- a/src/test/org/firebirdsql/jdbc/TestFBDriver.java +++ b/src/test/org/firebirdsql/jdbc/TestFBDriver.java @@ -30,6 +30,8 @@ import junit.framework.TestSuite; import org.firebirdsql.common.FBTestBase; +import static org.firebirdsql.common.FBTestProperties.*; + /** * Test suite for the FBDriver class implementation. * diff --git a/src/test/org/firebirdsql/jdbc/TestFBEncodings.java b/src/test/org/firebirdsql/jdbc/TestFBEncodings.java index abb474c02f..c4b4e09f30 100644 --- a/src/test/org/firebirdsql/jdbc/TestFBEncodings.java +++ b/src/test/org/firebirdsql/jdbc/TestFBEncodings.java @@ -30,6 +30,8 @@ import java.sql.Statement; import java.util.*; +import static org.firebirdsql.common.FBTestProperties.*; + /** * Describe class TestFBEncodings here. * diff --git a/src/test/org/firebirdsql/jdbc/TestFBLongVarCharEncodings.java b/src/test/org/firebirdsql/jdbc/TestFBLongVarCharEncodings.java index 711570e0dc..d73f65095f 100644 --- a/src/test/org/firebirdsql/jdbc/TestFBLongVarCharEncodings.java +++ b/src/test/org/firebirdsql/jdbc/TestFBLongVarCharEncodings.java @@ -26,6 +26,8 @@ import java.sql.ResultSet; import java.util.Properties; +import static org.firebirdsql.common.FBTestProperties.*; + /** * This test case tests encodings in text blobs. * diff --git a/src/test/org/firebirdsql/jdbc/TestFBParameterMetaData.java b/src/test/org/firebirdsql/jdbc/TestFBParameterMetaData.java index edc34480b5..06075567e3 100644 --- a/src/test/org/firebirdsql/jdbc/TestFBParameterMetaData.java +++ b/src/test/org/firebirdsql/jdbc/TestFBParameterMetaData.java @@ -27,6 +27,8 @@ import java.sql.Statement; import java.util.Properties; +import static org.firebirdsql.common.FBTestProperties.*; + /** * This method tests correctness of {@link FBParameterMetaData} class. * @@ -66,10 +68,10 @@ protected void setUp() throws Exception { Class.forName(FBDriver.class.getName()); Properties props = new Properties(); - props.putAll(this.getDefaultPropertiesForConnection()); + props.putAll(getDefaultPropertiesForConnection()); props.put("lc_ctype", "UNICODE_FSS"); - Connection connection = DriverManager.getConnection(this.getUrl(), props); + Connection connection = DriverManager.getConnection(getUrl(), props); Statement stmt = connection.createStatement(); try { @@ -89,10 +91,10 @@ protected void tearDown() throws Exception { public void testParameterMetaData() throws Exception { Properties props = new Properties(); - props.putAll(this.getDefaultPropertiesForConnection()); + props.putAll(getDefaultPropertiesForConnection()); props.put("lc_ctype", "UNICODE_FSS"); - Connection connection = DriverManager.getConnection(this.getUrl(), props); + Connection connection = DriverManager.getConnection(getUrl(), props); FirebirdPreparedStatement stmt = (FirebirdPreparedStatement)connection.prepareStatement(TEST_QUERY); diff --git a/src/test/org/firebirdsql/jdbc/TestFBPreparedStatement.java b/src/test/org/firebirdsql/jdbc/TestFBPreparedStatement.java index ebdd892fdc..7069c6a14e 100644 --- a/src/test/org/firebirdsql/jdbc/TestFBPreparedStatement.java +++ b/src/test/org/firebirdsql/jdbc/TestFBPreparedStatement.java @@ -26,6 +26,10 @@ import java.util.Properties; import java.util.TimeZone; +import static org.firebirdsql.common.DdlHelper.*; +import static org.firebirdsql.common.JdbcResourceHelper.*; +import static org.firebirdsql.common.FBTestProperties.*; + /** * Describe class TestFBPreparedStatement here. * diff --git a/src/test/org/firebirdsql/jdbc/TestFBPreparedStatementGeneratedKeys.java b/src/test/org/firebirdsql/jdbc/TestFBPreparedStatementGeneratedKeys.java index a4edab936a..ad80ceed38 100644 --- a/src/test/org/firebirdsql/jdbc/TestFBPreparedStatementGeneratedKeys.java +++ b/src/test/org/firebirdsql/jdbc/TestFBPreparedStatementGeneratedKeys.java @@ -29,6 +29,8 @@ import org.firebirdsql.gds.ISCConstants; +import static org.firebirdsql.common.JdbcResourceHelper.*; + /** * Tests for retrieval of auto generated keys through {@link java.sql.PreparedStatement} * implementation {@link FBPreparedStatement} created through {@link FBConnection} diff --git a/src/test/org/firebirdsql/jdbc/TestFBResultSet.java b/src/test/org/firebirdsql/jdbc/TestFBResultSet.java index 445fb1ca48..fcafac7305 100644 --- a/src/test/org/firebirdsql/jdbc/TestFBResultSet.java +++ b/src/test/org/firebirdsql/jdbc/TestFBResultSet.java @@ -31,6 +31,8 @@ import junit.textui.TestRunner; +import static org.firebirdsql.common.FBTestProperties.*; + public class TestFBResultSet extends FBTestBase { public static final String SELECT_STATEMENT = "" diff --git a/src/test/org/firebirdsql/jdbc/TestFBResultSetMetaData.java b/src/test/org/firebirdsql/jdbc/TestFBResultSetMetaData.java index 0dec6fd4cf..3c64a574db 100644 --- a/src/test/org/firebirdsql/jdbc/TestFBResultSetMetaData.java +++ b/src/test/org/firebirdsql/jdbc/TestFBResultSetMetaData.java @@ -24,6 +24,8 @@ import java.sql.*; import java.util.Properties; +import static org.firebirdsql.common.FBTestProperties.*; + /** * This method tests correctness of {@link FBResultSetMetaData} class. * @@ -65,10 +67,10 @@ protected void setUp() throws Exception { Class.forName(FBDriver.class.getName()); Properties props = new Properties(); - props.putAll(this.getDefaultPropertiesForConnection()); + props.putAll(getDefaultPropertiesForConnection()); props.put("lc_ctype", "UNICODE_FSS"); - Connection connection = DriverManager.getConnection(this.getUrl(), props); + Connection connection = DriverManager.getConnection(getUrl(), props); Statement stmt = connection.createStatement(); try { @@ -102,10 +104,10 @@ protected void tearDown() throws Exception { public void testResultSetMetaData() throws Exception { Properties props = new Properties(); - props.putAll(this.getDefaultPropertiesForConnection()); + props.putAll(getDefaultPropertiesForConnection()); props.put("lc_ctype", "UNICODE_FSS"); - Connection connection = DriverManager.getConnection(this.getUrl(), props); + Connection connection = DriverManager.getConnection(getUrl(), props); Statement stmt = connection.createStatement(); @@ -137,10 +139,10 @@ public void testResultSetMetaData() throws Exception { public void testResultSetMetaData2() throws Exception { Properties props = new Properties(); - props.putAll(this.getDefaultPropertiesForConnection()); + props.putAll(getDefaultPropertiesForConnection()); props.put("lc_ctype", "UNICODE_FSS"); - Connection connection = DriverManager.getConnection(this.getUrl(), props); + Connection connection = DriverManager.getConnection(getUrl(), props); FBDatabaseMetaData dmd = (FBDatabaseMetaData)connection.getMetaData(); int firebirdVersion = dmd.getDatabaseMajorVersion(); @@ -178,11 +180,11 @@ public void testResultSetMetaData2() throws Exception { public void testColumnTypeName() throws Exception { Properties props = new Properties(); - props.putAll(this.getDefaultPropertiesForConnection()); + props.putAll(getDefaultPropertiesForConnection()); props.put("lc_ctype", "UNICODE_FSS"); Connection connection = - DriverManager.getConnection(this.getUrl(), props); + DriverManager.getConnection(getUrl(), props); Statement stmt = connection.createStatement(); diff --git a/src/test/org/firebirdsql/jdbc/TestFBStatement.java b/src/test/org/firebirdsql/jdbc/TestFBStatement.java index 013817ce60..77877084e5 100644 --- a/src/test/org/firebirdsql/jdbc/TestFBStatement.java +++ b/src/test/org/firebirdsql/jdbc/TestFBStatement.java @@ -7,6 +7,9 @@ import org.firebirdsql.common.FBTestBase; +import static org.firebirdsql.common.DdlHelper.*; +import static org.firebirdsql.common.JdbcResourceHelper.*; + public class TestFBStatement extends FBTestBase { private Connection con; diff --git a/src/test/org/firebirdsql/jdbc/TestFBStatementGeneratedKeys.java b/src/test/org/firebirdsql/jdbc/TestFBStatementGeneratedKeys.java index ec0df477d9..b9d41c7c54 100644 --- a/src/test/org/firebirdsql/jdbc/TestFBStatementGeneratedKeys.java +++ b/src/test/org/firebirdsql/jdbc/TestFBStatementGeneratedKeys.java @@ -28,6 +28,8 @@ import org.firebirdsql.gds.ISCConstants; +import static org.firebirdsql.common.JdbcResourceHelper.*; + /** * Tests for retrieval of auto generated keys through {@link java.sql.Statement} * implementation {@link FBStatement}. diff --git a/src/test/org/firebirdsql/jdbc/TestFBUnmanagedConnection.java b/src/test/org/firebirdsql/jdbc/TestFBUnmanagedConnection.java index 704c0ae038..c66c172248 100644 --- a/src/test/org/firebirdsql/jdbc/TestFBUnmanagedConnection.java +++ b/src/test/org/firebirdsql/jdbc/TestFBUnmanagedConnection.java @@ -26,8 +26,12 @@ import junit.framework.Test; import junit.framework.TestSuite; + import org.firebirdsql.common.FBTestBase; +import static org.firebirdsql.common.DdlHelper.*; +import static org.firebirdsql.common.JdbcResourceHelper.*; + /** * Describe class TestFBUnmanagedConnection here. * diff --git a/src/test/org/firebirdsql/jdbc/TestFBWrappingDataSource.java b/src/test/org/firebirdsql/jdbc/TestFBWrappingDataSource.java index fcd44c5387..4f8c0b4684 100644 --- a/src/test/org/firebirdsql/jdbc/TestFBWrappingDataSource.java +++ b/src/test/org/firebirdsql/jdbc/TestFBWrappingDataSource.java @@ -33,7 +33,7 @@ import org.firebirdsql.common.FBTestBase; import org.firebirdsql.gds.impl.GDSType; -import static org.firebirdsql.common.SimpleFBTestBase.*; +import static org.firebirdsql.common.FBTestProperties.*; /** * Describe class TestFBWrappingDataSource here. diff --git a/src/test/org/firebirdsql/jdbc/TestTableReservation.java b/src/test/org/firebirdsql/jdbc/TestTableReservation.java index 99c2061474..fa682cd0fc 100644 --- a/src/test/org/firebirdsql/jdbc/TestTableReservation.java +++ b/src/test/org/firebirdsql/jdbc/TestTableReservation.java @@ -24,6 +24,7 @@ import org.firebirdsql.gds.ISCConstants; import org.firebirdsql.gds.TransactionParameterBuffer; +import static org.firebirdsql.common.DdlHelper.*; public class TestTableReservation extends FBTestBase { diff --git a/src/test/org/firebirdsql/management/TestBackupManager.java b/src/test/org/firebirdsql/management/TestBackupManager.java index 146ace856f..2c01fbedcc 100644 --- a/src/test/org/firebirdsql/management/TestBackupManager.java +++ b/src/test/org/firebirdsql/management/TestBackupManager.java @@ -12,7 +12,8 @@ import org.firebirdsql.gds.impl.GDSType; import org.firebirdsql.jdbc.FBConnection; -import static org.firebirdsql.common.SimpleFBTestBase.*; +import static org.firebirdsql.common.JdbcResourceHelper.*; +import static org.firebirdsql.common.FBTestProperties.*; /** * TODO: This test assumes it is run against localhost diff --git a/src/test/org/firebirdsql/management/TestFBMaintenanceManager.java b/src/test/org/firebirdsql/management/TestFBMaintenanceManager.java index dce7fbe81c..e38ef23846 100644 --- a/src/test/org/firebirdsql/management/TestFBMaintenanceManager.java +++ b/src/test/org/firebirdsql/management/TestFBMaintenanceManager.java @@ -18,7 +18,7 @@ import org.firebirdsql.gds.TransactionParameterBuffer; import org.firebirdsql.gds.impl.GDSType; -import static org.firebirdsql.common.SimpleFBTestBase.*; +import static org.firebirdsql.common.FBTestProperties.*; /** * Test the FBMaintenanceManager class diff --git a/src/test/org/firebirdsql/management/TestFBManager.java b/src/test/org/firebirdsql/management/TestFBManager.java index b2f8f3f4b3..7a685b1d9b 100644 --- a/src/test/org/firebirdsql/management/TestFBManager.java +++ b/src/test/org/firebirdsql/management/TestFBManager.java @@ -24,7 +24,7 @@ import junit.framework.Test; import junit.framework.TestSuite; -import static org.firebirdsql.common.SimpleFBTestBase.*; +import static org.firebirdsql.common.FBTestProperties.*; /** * Describe class TestFBManager here. diff --git a/src/test/org/firebirdsql/management/TestFBStatisticsManager.java b/src/test/org/firebirdsql/management/TestFBStatisticsManager.java index b6fb6ea1a9..1e0fbd413e 100644 --- a/src/test/org/firebirdsql/management/TestFBStatisticsManager.java +++ b/src/test/org/firebirdsql/management/TestFBStatisticsManager.java @@ -10,7 +10,7 @@ import org.firebirdsql.common.FBTestBase; import org.firebirdsql.gds.impl.GDSType; -import static org.firebirdsql.common.SimpleFBTestBase.*; +import static org.firebirdsql.common.FBTestProperties.*; /** * Test the FBStatisticsManager class diff --git a/src/test/org/firebirdsql/management/TestUserManager.java b/src/test/org/firebirdsql/management/TestUserManager.java index 5960916e13..1e13143a34 100644 --- a/src/test/org/firebirdsql/management/TestUserManager.java +++ b/src/test/org/firebirdsql/management/TestUserManager.java @@ -24,7 +24,7 @@ import org.firebirdsql.common.FBTestBase; -import static org.firebirdsql.common.SimpleFBTestBase.*; +import static org.firebirdsql.common.FBTestProperties.*; /** * Tests the UserManager class which uses the Services API to display, add, diff --git a/src/test/org/firebirdsql/pool/TestDriverConnectionPoolDataSource.java b/src/test/org/firebirdsql/pool/TestDriverConnectionPoolDataSource.java index ce1b3f5423..5928a5fb3c 100644 --- a/src/test/org/firebirdsql/pool/TestDriverConnectionPoolDataSource.java +++ b/src/test/org/firebirdsql/pool/TestDriverConnectionPoolDataSource.java @@ -26,6 +26,8 @@ import org.firebirdsql.gds.impl.GDSType; import org.firebirdsql.jdbc.FBDriver; +import static org.firebirdsql.common.FBTestProperties.*; + /** * * @author Roman Rokytskyy diff --git a/src/test/org/firebirdsql/pool/TestFBConnectionPoolDataSource.java b/src/test/org/firebirdsql/pool/TestFBConnectionPoolDataSource.java index c320c123ab..1288b28318 100644 --- a/src/test/org/firebirdsql/pool/TestFBConnectionPoolDataSource.java +++ b/src/test/org/firebirdsql/pool/TestFBConnectionPoolDataSource.java @@ -44,7 +44,7 @@ import org.firebirdsql.jdbc.FirebirdConnection; import org.firebirdsql.jdbc.FirebirdPreparedStatement; -import static org.firebirdsql.common.SimpleFBTestBase.*; +import static org.firebirdsql.common.FBTestProperties.*; /** * Test suite for JDBC connection pool. diff --git a/src/test/org/firebirdsql/pool/TestXADataSource.java b/src/test/org/firebirdsql/pool/TestXADataSource.java index 7cd6639fd9..536dadac23 100644 --- a/src/test/org/firebirdsql/pool/TestXADataSource.java +++ b/src/test/org/firebirdsql/pool/TestXADataSource.java @@ -30,6 +30,8 @@ import org.firebirdsql.common.FBTestBase; import org.firebirdsql.gds.ISCConstants; +import static org.firebirdsql.common.FBTestProperties.*; + /** * Test suite for XADataSource implementation. *