[teiid-commits] teiid SVN: r1286 - trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api.

Author: vhalbert(a)redhat.com Date: 2009-08-28 09:38:52 -0400 (Fri, 28 Aug 2009) New Revision: 1286 Added: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractQueryTest.java Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractMMQueryTestCase.java Log: Teiid-777 : consolidating the core logic for executing sql against a connection Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractMMQueryTestCase.java =================================================================== --- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractMMQueryTestCase.java 2009-08-27 19:04:17 UTC (rev 1285) +++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractMMQueryTestCase.java 2009-08-28 13:38:52 UTC (rev 1286) @@ -23,64 +23,26 @@ package com.metamatrix.jdbc.api; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.io.Reader; -import java.io.StringReader; import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; import java.sql.SQLException; -import java.sql.Statement; import java.util.Stack; -import org.junit.After; -import org.teiid.adminapi.Admin; import org.teiid.jdbc.TeiidDriver; -import com.metamatrix.script.io.MetadataReader; -import com.metamatrix.script.io.ResultSetReader; -import com.metamatrix.script.io.StringArrayReader; - /** - * This class can be used as the base class to write MMQuery based tests for - * integration testing. Just like the scripted one this one should provide all + * This class can be used as the base class to write Query based tests using + * the Teiid Driver for integration testing. Just like the scripted one this one should provide all * those required flexibility in testing. */ -public class AbstractMMQueryTestCase { +public class AbstractMMQueryTestCase extends AbstractQueryTest { static { new TeiidDriver(); } - protected com.metamatrix.jdbc.api.Connection internalConnection = null; - protected ResultSet internalResultSet = null; - protected Statement internalStatement = null; - protected int updateCount = -1; - protected String DELIMITER = " "; //$NON-NLS-1$ - private Stack<com.metamatrix.jdbc.api.Connection> contexts = new Stack<Connection>(); + private Stack<java.sql.Connection> contexts = new Stack<java.sql.Connection>(); - @After public void tearDown() throws Exception { - closeConnection(); - } - - public Admin getAdmin() { - try { - assertNotNull(this.internalConnection); - return this.internalConnection.getAdminAPI(); - } catch (SQLException e) { - throw new RuntimeException(e); - } - } - public void pushConnection() { this.contexts.push(this.internalConnection); this.internalConnection = null; @@ -90,10 +52,7 @@ this.internalConnection = this.contexts.pop(); } - public void setConnection(com.metamatrix.jdbc.api.Connection c) { - this.internalConnection = c; - } - public com.metamatrix.jdbc.api.Connection getConnection(String vdb, String propsFile){ + public com.metamatrix.jdbc.api.Connection getConnection(String vdb, String propsFile){ return getConnection(vdb, propsFile, ""); //$NON-NLS-1$ } @@ -106,7 +65,7 @@ } catch (SQLException e) { throw new RuntimeException(e); } - return this.internalConnection; + return (com.metamatrix.jdbc.api.Connection) this.internalConnection; } public static com.metamatrix.jdbc.api.Connection createConnection(String vdb, String propsFile, String addtionalStuff) throws SQLException { @@ -114,348 +73,11 @@ return (com.metamatrix.jdbc.api.Connection)DriverManager.getConnection(url); } - public boolean execute(String sql) { - return execute(sql, new Object[] {}); - } - - public boolean execute(String sql, Object[] params) { - closeResultSet(); - closeStatement(); - this.updateCount = -1; - try { - assertNotNull(this.internalConnection); - assertTrue(!this.internalConnection.isClosed()); - boolean result = false; - if (params != null) { - if (sql.startsWith("exec ")) { //$NON-NLS-1$ - sql = sql.substring(5); - this.internalStatement = this.internalConnection.prepareCall("{?=call "+sql+"}"); //$NON-NLS-1$ //$NON-NLS-2$ - } else { - this.internalStatement = this.internalConnection.prepareStatement(sql); - } - setParameters((PreparedStatement)this.internalStatement, params); - result = ((PreparedStatement)this.internalStatement).execute(); - } else { - this.internalStatement = this.internalConnection.createStatement(); - result = this.internalStatement.execute(sql); - } - if (result) { - this.internalResultSet = this.internalStatement.getResultSet(); - } else { - this.updateCount = this.internalStatement.getUpdateCount(); - } - return result; - } catch (SQLException e) { - throw new RuntimeException(e); - } - } - - private void setParameters(PreparedStatement stmt, Object[] params) throws SQLException{ - for (int i = 0; i < params.length; i++) { - stmt.setObject(i+1, params[i]); - } - } - - public void assertResultsSetEquals(File expected) { - assertResultsSetEquals(this.internalResultSet, expected); - } - - public void assertResultsSetEquals(ResultSet resultSet, File expected) { - assertNotNull(resultSet); - - BufferedReader resultReader = null; - BufferedReader expectedReader = null; - try { - resultReader = new BufferedReader(new ResultSetReader(resultSet, DELIMITER)); - expectedReader = new BufferedReader(new FileReader(expected)); - compareResults(resultReader, expectedReader); - } catch (Exception e) { - throw new RuntimeException(e); - }finally { - try { - resultReader.close(); - expectedReader.close(); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - } - - public void assertResultsSetEquals(String expected) { - assertResultsSetEquals(this.internalResultSet, expected); - } - - public void assertResultsSetEquals(ResultSet resultSet,String expected) { - assertNotNull(resultSet); - - BufferedReader resultReader = null; - BufferedReader expectedReader = null; - try { - resultReader = new BufferedReader(new ResultSetReader(resultSet, DELIMITER)); - expectedReader = new BufferedReader(new StringReader(expected)); - compareResults(resultReader, expectedReader); - }catch(Exception e){ - throw new RuntimeException(e); - }finally { - try { - resultReader.close(); - expectedReader.close(); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - } - - public void assertResults(String[] expected) { - assertResultsSetEquals(expected); - } - - public void assertResultsSetEquals(String[] expected) { - assertResultsSetEquals(this.internalResultSet, expected); - } - - public void assertResultsSetEquals(ResultSet resultSet, String[] expected) { - assertNotNull(resultSet); - - BufferedReader resultReader = null; - BufferedReader expectedReader = null; - try { - resultReader = new BufferedReader(new ResultSetReader(resultSet, DELIMITER)); - expectedReader = new BufferedReader(new StringArrayReader(expected)); - compareResults(resultReader, expectedReader); - }catch(Exception e){ - throw new RuntimeException(e); - }finally { - try { - resultReader.close(); - expectedReader.close(); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - } - - public void assertReaderEquals(Reader expected, Reader reader) { - - BufferedReader resultReader = null; - BufferedReader expectedReader = null; - try { - expectedReader = new BufferedReader(expected); - resultReader = new BufferedReader(reader); - compareResults(resultReader, expectedReader); - } catch (Exception e) { - throw new RuntimeException(e); - } finally { - try { - resultReader.close(); - expectedReader.close(); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - } - - public void assertResultsSetMetadataEquals(ResultSetMetaData metadata, File expected) { - assertNotNull(metadata); - - BufferedReader resultReader = null; - BufferedReader expectedReader = null; - try { - resultReader = new BufferedReader(new MetadataReader(metadata, DELIMITER)); - expectedReader = new BufferedReader(new FileReader(expected)); - compareResults(resultReader, expectedReader); - } catch (Exception e) { - throw new RuntimeException(e); - }finally { - try { - resultReader.close(); - expectedReader.close(); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - } - - public void assertResultsSetMetadataEquals(ResultSetMetaData metadata, String[] expected) { - assertNotNull(metadata); - - BufferedReader resultReader = null; - BufferedReader expectedReader = null; - try { - resultReader = new BufferedReader(new MetadataReader(metadata, DELIMITER)); - expectedReader = new BufferedReader(new StringArrayReader(expected)); - compareResults(resultReader, expectedReader); - } catch (Exception e) { - throw new RuntimeException(e); - }finally { - try { - resultReader.close(); - expectedReader.close(); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - } - - static String read(BufferedReader r) throws IOException { - StringBuffer result = new StringBuffer(); - String s = null; - try { - while ((s = r.readLine()) != null) { - result.append(s.trim()); - result.append("\n"); //$NON-NLS-1$ - } - } finally { - r.close(); - } - return result.toString(); - } - - void compareResults(BufferedReader resultReader, BufferedReader expectedReader) throws IOException { - assertEquals(read(expectedReader), read(resultReader)); - } - - public void printResults() { - printResults(this.internalResultSet); - } - - public void printResults(ResultSet results) { - printResults(results, false); - } - - public void printResults(boolean comparePrint) { - assertNotNull(this.internalResultSet); - printResults(this.internalResultSet, comparePrint); - } - - public void walkResults() { - assertNotNull(this.internalResultSet); - - try { - int columnCount = this.internalResultSet.getMetaData().getColumnCount(); - while(this.internalResultSet.next()) { - for (int col = 1; col <= columnCount; col++) { - this.internalResultSet.getObject(col); - } - } - closeResultSet(); - } catch (SQLException e) { - throw new RuntimeException(e); - } - } - - void printResults(ResultSet results, boolean comparePrint) { - if(results == null) { - System.out.println("ResultSet is null"); //$NON-NLS-1$ - return; - } - int row; - try { - row = -1; - BufferedReader in = new BufferedReader(new ResultSetReader(results, DELIMITER)); - String line = in.readLine(); - while(line != null) { - row++; - if (comparePrint) { - line=line.replaceAll("\"", "\\\\\""); //$NON-NLS-1$ //$NON-NLS-2$ - System.out.println("\""+line+"\","); //$NON-NLS-1$ //$NON-NLS-2$ - } - else { - System.out.println(line); - } - line = in.readLine(); - } - System.out.println("Fetched "+row+" rows\n"); //$NON-NLS-1$ //$NON-NLS-2$ - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - public void assertUpdateCount(int expected) { - assertEquals(expected, updateCount); - } - - public void assertRowCount(int expected) { - int count = getRowCount(); - assertEquals(expected, count); - } - - public int getRowCount() { - assertNotNull(this.internalResultSet); - // Count all - try { - int count = 0; - while(this.internalResultSet.next()) { - count++; - } - return count; - } catch (SQLException e) { - throw new RuntimeException(e); - } - } - - public void closeStatement() { - closeResultSet(); - - if (this.internalStatement != null){ - try { - this.internalStatement.close(); - } catch(SQLException e) { - throw new RuntimeException(e); - } finally { - this.internalStatement = null; - } - } - } - - public void closeResultSet() { - if (this.internalResultSet != null) { - try { - this.internalResultSet.close(); - } catch(SQLException e) { - // ignore - } finally { - this.internalResultSet = null; - } - } - } - - public void closeConnection() { - closeStatement(); - try { - if (this.internalConnection != null) { - try { - this.internalConnection.close(); - } catch(SQLException e) { - throw new RuntimeException(e); - } - } - } finally { - this.internalConnection = null; - } - } - - public void print(String msg) { - System.out.println(msg); - } - - public void print(Throwable e) { - e.printStackTrace(); - } - + protected void helpTest(String query, String[] expected, String vdb, String props, String urlProperties) { getConnection(vdb, props, urlProperties); executeAndAssertResults(query, expected); closeConnection(); } - - protected void executeAndAssertResults(String query, String[] expected) { - execute(query); - if (expected != null) { - assertResults(expected); - } - else { - printResults(); - } - } + } \ No newline at end of file Added: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractQueryTest.java =================================================================== --- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractQueryTest.java (rev 0) +++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractQueryTest.java 2009-08-28 13:38:52 UTC (rev 1286) @@ -0,0 +1,483 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package com.metamatrix.jdbc.api; + + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.io.Reader; +import java.io.StringReader; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.ResultSetMetaData; +import java.sql.SQLException; +import java.sql.Statement; +import java.sql.Connection; + +import org.junit.After; +import org.teiid.adminapi.Admin; + +import com.metamatrix.script.io.MetadataReader; +import com.metamatrix.script.io.ResultSetReader; +import com.metamatrix.script.io.StringArrayReader; + + +/** + * This class can be used as the base class to write Query tests for + * integration testing. Just like the scripted one this one should provide all + * those required flexibility in testing. + */ +public abstract class AbstractQueryTest { + + + protected Connection internalConnection = null; + protected ResultSet internalResultSet = null; + protected Statement internalStatement = null; + protected int updateCount = -1; + protected String DELIMITER = " "; //$NON-NLS-1$ + + @After public void tearDown() throws Exception { + closeConnection(); + } + + public Admin getAdmin() { + try { + assertNotNull(this.internalConnection); + com.metamatrix.jdbc.api.Connection conn = (com.metamatrix.jdbc.api.Connection) this.internalConnection; + return conn.getAdminAPI(); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + + public void setConnection(Connection c) { + this.internalConnection = c; + } + + public Connection getConnection() { + return this.internalConnection; + } + + public boolean execute(String sql) { + return execute(sql, new Object[] {}); + } + + public boolean execute(String sql, Object[] params) { + closeResultSet(); + closeStatement(); + this.updateCount = -1; + try { + assertNotNull(this.internalConnection); + assertTrue(!this.internalConnection.isClosed()); + boolean result = false; + if (params != null) { + if (sql.startsWith("exec ")) { //$NON-NLS-1$ + sql = sql.substring(5); + this.internalStatement = this.internalConnection.prepareCall("{?=call "+sql+"}"); //$NON-NLS-1$ //$NON-NLS-2$ + } else { + this.internalStatement = this.internalConnection.prepareStatement(sql); + } + setParameters((PreparedStatement)this.internalStatement, params); + assignExecutionProperties(this.internalStatement); + result = ((PreparedStatement)this.internalStatement).execute(); + } else { + this.internalStatement = this.internalConnection.createStatement(); + assignExecutionProperties(this.internalStatement); + result = this.internalStatement.execute(sql); + } + if (result) { + this.internalResultSet = this.internalStatement.getResultSet(); + } else { + this.updateCount = this.internalStatement.getUpdateCount(); + } + return result; + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + + private void setParameters(PreparedStatement stmt, Object[] params) throws SQLException{ + for (int i = 0; i < params.length; i++) { + stmt.setObject(i+1, params[i]); + } + } + + public int[] executeBatch(String[] sql) { + return executeBatch(sql, -1); + } + + public int[] executeBatch(String[] sql, int timeout) { + closeResultSet(); + closeStatement(); + + try { + assertNotNull(this.internalConnection); + assertTrue(!this.internalConnection.isClosed()); + + for (int i = 0; i < sql.length; i++) { + if (sql[i].indexOf("?") != -1) { //$NON-NLS-1$ + throw new RuntimeException("no prepared statements allowed in the batch command"); //$NON-NLS-1$ + } + } + + this.internalStatement = this.internalConnection.createStatement(); + assignExecutionProperties(this.internalStatement); + + if (timeout != -1) { + this.internalStatement.setQueryTimeout(timeout); + } + for (int i = 0; i < sql.length; i++) { + this.internalStatement.addBatch(sql[i]); + } + + return this.internalStatement.executeBatch(); + + } catch (SQLException e) { + throw new RuntimeException(e); + } + + } + + /** + * Override when you need to set an execution property on the statement before execution. + * + * <p>Example: + *<code>if (this.executionProperties.getProperty(ExecutionProperties.PROP_FETCH_SIZE) != null) { + * statement.setExecutionProperty(ExecutionProperties.PROP_FETCH_SIZE, this.executionProperties.getProperty(ExecutionProperties.PROP_FETCH_SIZE)); + * } + *</code> + *</p> + * @param stmt + * + * @since + */ + + + protected void assignExecutionProperties(Statement stmt) { + } + + + public void assertResultsSetEquals(File expected) { + assertResultsSetEquals(this.internalResultSet, expected); + } + + public void assertResultsSetEquals(ResultSet resultSet, File expected) { + assertNotNull(resultSet); + + BufferedReader resultReader = null; + BufferedReader expectedReader = null; + try { + resultReader = new BufferedReader(new ResultSetReader(resultSet, DELIMITER)); + expectedReader = new BufferedReader(new FileReader(expected)); + compareResults(resultReader, expectedReader); + } catch (Exception e) { + throw new RuntimeException(e); + }finally { + try { + resultReader.close(); + expectedReader.close(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + } + + public void assertResultsSetEquals(String expected) { + assertResultsSetEquals(this.internalResultSet, expected); + } + + public void assertResultsSetEquals(ResultSet resultSet,String expected) { + assertNotNull(resultSet); + + BufferedReader resultReader = null; + BufferedReader expectedReader = null; + try { + resultReader = new BufferedReader(new ResultSetReader(resultSet, DELIMITER)); + expectedReader = new BufferedReader(new StringReader(expected)); + compareResults(resultReader, expectedReader); + }catch(Exception e){ + throw new RuntimeException(e); + }finally { + try { + resultReader.close(); + expectedReader.close(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + } + + public void assertResults(String[] expected) { + assertResultsSetEquals(expected); + } + + public void assertResultsSetEquals(String[] expected) { + assertResultsSetEquals(this.internalResultSet, expected); + } + + public void assertResultsSetEquals(ResultSet resultSet, String[] expected) { + assertNotNull(resultSet); + + BufferedReader resultReader = null; + BufferedReader expectedReader = null; + try { + resultReader = new BufferedReader(new ResultSetReader(resultSet, DELIMITER)); + expectedReader = new BufferedReader(new StringArrayReader(expected)); + compareResults(resultReader, expectedReader); + }catch(Exception e){ + throw new RuntimeException(e); + }finally { + try { + resultReader.close(); + expectedReader.close(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + } + + public void assertReaderEquals(Reader expected, Reader reader) { + + BufferedReader resultReader = null; + BufferedReader expectedReader = null; + try { + expectedReader = new BufferedReader(expected); + resultReader = new BufferedReader(reader); + compareResults(resultReader, expectedReader); + } catch (Exception e) { + throw new RuntimeException(e); + } finally { + try { + resultReader.close(); + expectedReader.close(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + } + + public void assertResultsSetMetadataEquals(ResultSetMetaData metadata, File expected) { + assertNotNull(metadata); + + BufferedReader resultReader = null; + BufferedReader expectedReader = null; + try { + resultReader = new BufferedReader(new MetadataReader(metadata, DELIMITER)); + expectedReader = new BufferedReader(new FileReader(expected)); + compareResults(resultReader, expectedReader); + } catch (Exception e) { + throw new RuntimeException(e); + }finally { + try { + resultReader.close(); + expectedReader.close(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + } + + public void assertResultsSetMetadataEquals(ResultSetMetaData metadata, String[] expected) { + assertNotNull(metadata); + + BufferedReader resultReader = null; + BufferedReader expectedReader = null; + try { + resultReader = new BufferedReader(new MetadataReader(metadata, DELIMITER)); + expectedReader = new BufferedReader(new StringArrayReader(expected)); + compareResults(resultReader, expectedReader); + } catch (Exception e) { + throw new RuntimeException(e); + }finally { + try { + resultReader.close(); + expectedReader.close(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + } + + static String read(BufferedReader r) throws IOException { + StringBuffer result = new StringBuffer(); + String s = null; + try { + while ((s = r.readLine()) != null) { + result.append(s.trim()); + result.append("\n"); //$NON-NLS-1$ + } + } finally { + r.close(); + } + return result.toString(); + } + + void compareResults(BufferedReader resultReader, BufferedReader expectedReader) throws IOException { + assertEquals(read(expectedReader), read(resultReader)); + } + + public void printResults() { + printResults(this.internalResultSet); + } + + public void printResults(ResultSet results) { + printResults(results, false); + } + + public void printResults(boolean comparePrint) { + assertNotNull(this.internalResultSet); + printResults(this.internalResultSet, comparePrint); + } + + public void walkResults() { + assertNotNull(this.internalResultSet); + + try { + int columnCount = this.internalResultSet.getMetaData().getColumnCount(); + while(this.internalResultSet.next()) { + for (int col = 1; col <= columnCount; col++) { + this.internalResultSet.getObject(col); + } + } + closeResultSet(); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + + void printResults(ResultSet results, boolean comparePrint) { + if(results == null) { + System.out.println("ResultSet is null"); //$NON-NLS-1$ + return; + } + int row; + try { + row = -1; + BufferedReader in = new BufferedReader(new ResultSetReader(results, DELIMITER)); + String line = in.readLine(); + while(line != null) { + row++; + if (comparePrint) { + line=line.replaceAll("\"", "\\\\\""); //$NON-NLS-1$ //$NON-NLS-2$ + System.out.println("\""+line+"\","); //$NON-NLS-1$ //$NON-NLS-2$ + } + else { + System.out.println(line); + } + line = in.readLine(); + } + System.out.println("Fetched "+row+" rows\n"); //$NON-NLS-1$ //$NON-NLS-2$ + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + public void assertUpdateCount(int expected) { + assertEquals(expected, updateCount); + } + + public void assertRowCount(int expected) { + int count = getRowCount(); + assertEquals(expected, count); + } + + public int getRowCount() { + assertNotNull(this.internalResultSet); + // Count all + try { + int count = 0; + while(this.internalResultSet.next()) { + count++; + } + return count; + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + + public void closeStatement() { + closeResultSet(); + + if (this.internalStatement != null){ + try { + this.internalStatement.close(); + } catch(SQLException e) { + throw new RuntimeException(e); + } finally { + this.internalStatement = null; + } + } + } + + public void closeResultSet() { + if (this.internalResultSet != null) { + try { + this.internalResultSet.close(); + } catch(SQLException e) { + // ignore + } finally { + this.internalResultSet = null; + } + } + } + + public void closeConnection() { + closeStatement(); + try { + if (this.internalConnection != null) { + try { + this.internalConnection.close(); + } catch(SQLException e) { + throw new RuntimeException(e); + } + } + } finally { + this.internalConnection = null; + } + } + + public void print(String msg) { + System.out.println(msg); + } + + public void print(Throwable e) { + e.printStackTrace(); + } + + + protected void executeAndAssertResults(String query, String[] expected) { + execute(query); + if (expected != null) { + assertResults(expected); + } + else { + printResults(); + } + } +} \ No newline at end of file Property changes on: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractQueryTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain