Changeset: 389f970c7686 for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java/rev/389f970c7686
Modified Files:
src/test/java/JDBC_API_Tester.java
src/test/java/org/monetdb/jdbc/ApiTests.java
Branch: default
Log Message:
Convert Test_EmptySql() -> ApiTests#testEmptySQL()
diffs (184 lines):
diff --git a/src/test/java/JDBC_API_Tester.java
b/src/test/java/JDBC_API_Tester.java
--- a/src/test/java/JDBC_API_Tester.java
+++ b/src/test/java/JDBC_API_Tester.java
@@ -1025,143 +1025,6 @@ public final class JDBC_API_Tester exten
}
@Test
- public void Test_EmptySql() {
- sb.setLength(0); // clear the output log buffer
-
- Statement stmt = null;
- try {
- stmt = con.createStatement();
- } catch (SQLException e) {
- sb.append("FAILED:
").append(e.getMessage()).append("\n");
- }
-
- try {
- stmt.execute(null);
- sb.append("Failed to check null parameter!\n");
- } catch (SQLException e) {
- sb.append(e.getMessage()).append("\n");
- }
- try {
- stmt.execute("");
- sb.append("Failed to check empty sql string!\n");
- } catch (SQLException e) {
- sb.append(e.getMessage()).append("\n");
- }
-
- try {
- int ret = stmt.executeUpdate(null);
- sb.append("Failed to check null parameter!\n");
- } catch (SQLException e) {
- sb.append(e.getMessage()).append("\n");
- }
- try {
- int ret = stmt.executeUpdate("");
- sb.append("Failed to check empty sql string!\n");
- } catch (SQLException e) {
- sb.append(e.getMessage()).append("\n");
- }
- try {
- long ret = stmt.executeLargeUpdate(null);
- sb.append("Failed to check null parameter!\n");
- } catch (SQLException e) {
- sb.append(e.getMessage()).append("\n");
- }
- try {
- long ret = stmt.executeLargeUpdate("");
- sb.append("Failed to check empty sql string!\n");
- } catch (SQLException e) {
- sb.append(e.getMessage()).append("\n");
- }
- try {
- stmt.addBatch(null);
- sb.append("Failed to check null parameter!\n");
- } catch (SQLException e) {
- sb.append(e.getMessage()).append("\n");
- }
- try {
- stmt.addBatch("");
- sb.append("Failed to check empty sql string!\n");
- } catch (SQLException e) {
- sb.append(e.getMessage()).append("\n");
- }
-
- ResultSet rs = null;
- try {
- rs = stmt.executeQuery(null);
- sb.append("Failed to check null parameter!\n");
- } catch (SQLException e) {
- sb.append(e.getMessage()).append("\n");
- }
- try {
- rs = stmt.executeQuery("");
- sb.append("Failed to check empty sql string!\n");
- } catch (SQLException e) {
- sb.append(e.getMessage()).append("\n");
- }
- closeStmtResSet(stmt, rs);
-
- PreparedStatement pstmt = null;
- try {
- pstmt = con.prepareStatement(null);
- sb.append("Failed to check null parameter!\n");
- } catch (SQLException e) {
- sb.append(e.getMessage()).append("\n");
- }
- try {
- pstmt = con.prepareStatement("");
- sb.append("Failed to check empty sql string!\n");
- } catch (SQLException e) {
- sb.append(e.getMessage()).append("\n");
- }
- try {
- pstmt = con.prepareStatement(null,
Statement.RETURN_GENERATED_KEYS);
- sb.append("Failed to check null parameter!\n");
- } catch (SQLException e) {
- sb.append(e.getMessage()).append("\n");
- }
- try {
- pstmt = con.prepareStatement("",
Statement.RETURN_GENERATED_KEYS);
- sb.append("Failed to check empty sql string!\n");
- } catch (SQLException e) {
- sb.append(e.getMessage()).append("\n");
- }
- closeStmtResSet(pstmt, null);
-
- CallableStatement cstmt = null;
- try {
- pstmt = con.prepareCall(null);
- sb.append("Failed to check null parameter!\n");
- } catch (SQLException e) {
- sb.append(e.getMessage()).append("\n");
- }
- try {
- pstmt = con.prepareCall("");
- sb.append("Failed to check empty sql string!\n");
- } catch (SQLException e) {
- sb.append(e.getMessage()).append("\n");
- }
- closeStmtResSet(cstmt, null);
-
- compareExpectedOutput("Test_EmptySql",
- "Missing SQL statement\n" +
- "Missing SQL statement\n" +
- "Missing SQL statement\n" +
- "Missing SQL statement\n" +
- "Missing SQL statement\n" +
- "Missing SQL statement\n" +
- "Missing SQL statement\n" +
- "Missing SQL statement\n" +
- "Missing SQL statement\n" +
- "Missing SQL statement\n" +
- "Missing SQL statement\n" +
- "Missing SQL statement\n" +
- "Missing SQL statement\n" +
- "Missing SQL statement\n" +
- "Missing SQL statement\n" +
- "Missing SQL statement\n");
- }
-
- @Test
public void Test_FetchSize() {
sb.setLength(0); // clear the output log buffer
diff --git a/src/test/java/org/monetdb/jdbc/ApiTests.java
b/src/test/java/org/monetdb/jdbc/ApiTests.java
--- a/src/test/java/org/monetdb/jdbc/ApiTests.java
+++ b/src/test/java/org/monetdb/jdbc/ApiTests.java
@@ -409,4 +409,33 @@ public class ApiTests {
assertEquals(expectTLS, props.containsKey("cert"));
assertEquals(expectTLS, props.containsKey("certhash"));
}
+
+ @Test
+ public void testEmptySQL() throws SQLException {
+ String msg = "Missing SQL statement";
+
+ assertSQLException(msg, () -> stmt.execute(""));
+ assertSQLException(msg, () -> stmt.execute(null));
+
+ assertSQLException(msg, () -> stmt.executeUpdate(""));
+ assertSQLException(msg, () -> stmt.executeUpdate(null));
+
+ assertSQLException(msg, () -> stmt.executeLargeUpdate(""));
+ assertSQLException(msg, () -> stmt.executeLargeUpdate(null));
+
+ assertSQLException(msg, () -> stmt.addBatch(""));
+ assertSQLException(msg, () -> stmt.addBatch(null));
+
+ assertSQLException(msg, () -> stmt.executeQuery(""));
+ assertSQLException(msg, () -> stmt.executeQuery(null));
+
+ assertSQLException(msg, () -> conn.prepareStatement(""));
+ assertSQLException(msg, () -> conn.prepareStatement(null));
+
+ assertSQLException(msg, () -> conn.prepareStatement("",
Statement.RETURN_GENERATED_KEYS));
+ assertSQLException(msg, () -> conn.prepareStatement(null,
Statement.RETURN_GENERATED_KEYS));
+
+ assertSQLException(msg, () -> conn.prepareCall(""));
+ assertSQLException(msg, () -> conn.prepareCall(null));
+ }
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
