Mercurial > hg > monetdb-java

comparison tests/OnClientTester.java @ 592:b58f6f26fab0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add removal of used table foo. Also eliminated duplicate code.
author Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
date Thu, 18 Nov 2021 21:21:13 +0100 (2021-11-18)
parents b2cd3b828967
children 613f94a13ad6
comparison
equal deleted inserted replaced
591:b2cd3b828967 592:b58f6f26fab0
146 } 146 }
147 System.err.println("Innermost cause was " + t); 147 System.err.println("Innermost cause was " + t);
148 if (t.getStackTrace().length > 0) { 148 if (t.getStackTrace().length > 0) {
149 System.err.println(" at " + t.getStackTrace()[0]); 149 System.err.println(" at " + t.getStackTrace()[0]);
150 } 150 }
151 } finally {
152 try {
153 // cleanup created test table
154 execute("DROP TABLE IF EXISTS foo");
155 } catch (SQLException e) { /* ignore */ }
151 } 156 }
152 closeConnection(); 157 closeConnection();
153 return failures; 158 return failures;
154 } 159 }
155 160
666 } 671 }
667 672
668 private boolean execute(String query) throws SQLException { 673 private boolean execute(String query) throws SQLException {
669 outBuffer.append("EXECUTE: ").append(query).append("\n"); 674 outBuffer.append("EXECUTE: ").append(query).append("\n");
670 final boolean result = stmt.execute(query); 675 final boolean result = stmt.execute(query);
671 if (result) { 676 outBuffer.append(" OK");
672 outBuffer.append(" OK").append("\n"); 677 if (!result) {
673 } else { 678 outBuffer.append(", updated ").append(stmt.getUpdateCount()).append(" rows");
674 outBuffer.append(" OK, updated ").append(stmt.getUpdateCount()).append(" rows").append("\n"); 679 }
675 } 680 outBuffer.append("\n");
676 return result; 681 return result;
677 } 682 }
678 683
679 private void update(String query) throws SQLException, Failure { 684 private void update(String query) throws SQLException, Failure {
680 execute(query); 685 execute(query);
710 checked("row count", 1); 715 checked("row count", 1);
711 assertEq("query result", expected, result); 716 assertEq("query result", expected, result);
712 } 717 }
713 718
714 private void assertQueryString(String query, String expected) throws SQLException, Failure { 719 private void assertQueryString(String query, String expected) throws SQLException, Failure {
715 if (execute(query) == false) { 720 final String result = queryString(query);
716 fail("Query does not return a result set");
717 }
718 final ResultSet rs = stmt.getResultSet();
719 final ResultSetMetaData metaData = rs.getMetaData();
720 assertEq("column count", 1, metaData.getColumnCount());
721 if (!rs.next()) {
722 fail("Result set is empty");
723 }
724 final String result = rs.getString(1);
725 if (rs.next()) {
726 fail("Result set has more than one row");
727 }
728 rs.close();
729 checked("row count", 1);
730 assertEq("query result", expected, result); 721 assertEq("query result", expected, result);
731 } 722 }
732 723
733 private String queryString(String query) throws SQLException, Failure { 724 private String queryString(String query) throws SQLException, Failure {
734 if (execute(query) == false) { 725 if (execute(query) == false) {