comparison tests/OnClientTester.java @ 622:61877c1f19f6

Optimizations
author Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
date Thu, 20 Jan 2022 12:06:49 +0100 (2022-01-20)
parents 5e09597054d6
children 3442d331cad0
comparison
equal deleted inserted replaced
621:5e09597054d6 622:61877c1f19f6
21 import java.nio.file.SimpleFileVisitor; 21 import java.nio.file.SimpleFileVisitor;
22 import java.nio.file.attribute.BasicFileAttributes; 22 import java.nio.file.attribute.BasicFileAttributes;
23 import java.sql.Connection; 23 import java.sql.Connection;
24 import java.sql.DriverManager; 24 import java.sql.DriverManager;
25 import java.sql.ResultSet; 25 import java.sql.ResultSet;
26 import java.sql.ResultSetMetaData;
27 import java.sql.Statement; 26 import java.sql.Statement;
28 import java.sql.SQLException; 27 import java.sql.SQLException;
29 import java.util.ArrayList; 28 import java.util.ArrayList;
30 import java.util.List; 29 import java.util.List;
31 import java.util.Random; 30 import java.util.Random;
80 } 79 }
81 80
82 public static void main(String[] args) { 81 public static void main(String[] args) {
83 String jdbcUrl = null; 82 String jdbcUrl = null;
84 int verbosity = 0; 83 int verbosity = 0;
85 ArrayList<String> selectedTests = new ArrayList<>(); 84 ArrayList<String> selectedTests = new ArrayList<String>();
86 85
87 for (String arg : args) { 86 for (String arg : args) {
88 if (arg.equals("-v")) 87 if (arg.equals("-v"))
89 verbosity++; 88 verbosity++;
90 else if (arg.equals("-vv")) 89 else if (arg.equals("-vv"))
990 989
991 private void expectError(String query, String expectedError) throws SQLException { 990 private void expectError(String query, String expectedError) throws SQLException {
992 try { 991 try {
993 execute(query); 992 execute(query);
994 } catch (SQLException e) { 993 } catch (SQLException e) {
995 if (e.getMessage().contains(expectedError)) { 994 String msg = e.getMessage();
996 outBuffer.append(" GOT EXPECTED EXCEPTION: ").append(e.getMessage()).append("\n"); 995 if (msg.contains(expectedError)) {
996 outBuffer.append(" GOT EXPECTED EXCEPTION: ").append(msg).append("\n");
997 } else { 997 } else {
998 throw e; 998 throw e;
999 } 999 }
1000 } 1000 }
1001 } 1001 }
1003 private void assertQueryInt(String query, int expected) throws SQLException, Failure { 1003 private void assertQueryInt(String query, int expected) throws SQLException, Failure {
1004 if (execute(query) == false) { 1004 if (execute(query) == false) {
1005 fail("Query does not return a result set"); 1005 fail("Query does not return a result set");
1006 } 1006 }
1007 final ResultSet rs = stmt.getResultSet(); 1007 final ResultSet rs = stmt.getResultSet();
1008 final ResultSetMetaData metaData = rs.getMetaData(); 1008 assertEq("column count", 1, rs.getMetaData().getColumnCount());
1009 assertEq("column count", 1, metaData.getColumnCount());
1010 if (!rs.next()) { 1009 if (!rs.next()) {
1011 rs.close(); 1010 rs.close();
1012 fail("Result set is empty"); 1011 fail("Result set is empty");
1013 } 1012 }
1014 final int result = rs.getInt(1); 1013 final int result = rs.getInt(1);
1029 private String queryString(String query) throws SQLException, Failure { 1028 private String queryString(String query) throws SQLException, Failure {
1030 if (execute(query) == false) { 1029 if (execute(query) == false) {
1031 fail("Query does not return a result set"); 1030 fail("Query does not return a result set");
1032 } 1031 }
1033 final ResultSet rs = stmt.getResultSet(); 1032 final ResultSet rs = stmt.getResultSet();
1034 final ResultSetMetaData metaData = rs.getMetaData(); 1033 assertEq("column count", 1, rs.getMetaData().getColumnCount());
1035 assertEq("column count", 1, metaData.getColumnCount());
1036 if (!rs.next()) { 1034 if (!rs.next()) {
1037 rs.close(); 1035 rs.close();
1038 fail("Result set is empty"); 1036 fail("Result set is empty");
1039 } 1037 }
1040 final String result = rs.getString(1); 1038 final String result = rs.getString(1);