Changeset: 095acd2b1e8f for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java/rev/095acd2b1e8f
Modified Files:
src/test/java/JDBC_API_Tester.java
src/test/java/org/monetdb/jdbc/ApiTests.java
Branch: default
Log Message:
Convert Test_Smoreresults() -> ApiTests#testMoreResults()
diffs (98 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
@@ -1878,50 +1878,6 @@ public final class JDBC_API_Tester exten
}
@Test
- public void Test_Smoreresults() {
- sb.setLength(0); // clear the output log buffer
-
- Statement stmt = null;
- try {
- // >> true: auto commit should be on by default
- sb.append("0.
true\t").append(con.getAutoCommit()).append("\n");
-
- stmt = con.createStatement();
- sb.append("1. more results?...");
- if (stmt.getMoreResults() != false ||
stmt.getUpdateCount() != -1)
- sb.append("more results on an uninitialized
Statement, how can that be?\n");
- sb.append(" nope :)\n");
-
- sb.append("2. SELECT 1...");
- if (stmt.execute("SELECT 1;") == false)
- sb.append("SELECT 1 returns update or no
results\n");
- sb.append(" ResultSet :)\n");
-
- sb.append("3. more results?...");
- if (stmt.getMoreResults() != false ||
stmt.getUpdateCount() != -1)
- sb.append("more results after SELECT 1 query,
how can that be?\n");
- sb.append(" nope :)\n");
-
- sb.append("4. even more results?...");
- if (stmt.getMoreResults() != false)
- sb.append("still more results after SELECT 1
query, how can that be?\n");
- sb.append(" nope :)\n");
-
- } catch (SQLException e) {
- sb.append("FAILED:
").append(e.getMessage()).append("\n");
- }
-
- closeStmtResSet(stmt, null);
-
- compareExpectedOutput("Test_Smoreresults",
- "0. true true\n" +
- "1. more results?... nope :)\n" +
- "2. SELECT 1... ResultSet :)\n" +
- "3. more results?... nope :)\n" +
- "4. even more results?... nope :)\n");
- }
-
- @Test
public void Test_Wrapper() {
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
@@ -1603,4 +1603,40 @@ public class ApiTests {
assertTrue(rs.isAfterLast());
}
}
+
+ @Test
+ public void testMoreResults() throws SQLException {
+ boolean haveResultSet;
+
+ try (Statement stmt = conn.createStatement()) {
+ // We haven't executed anything with stmt yet.
+ // There are not Results let alone MoreResults
+ assertFalse(stmt.getMoreResults());
+ assertEquals(-1, stmt.getUpdateCount());
+
+ // Execute a single-statement block
+ haveResultSet = stmt.execute("SELECT 1");
+ // First result set
+ assertTrue(haveResultSet);
+ // No second result set
+ assertFalse(stmt.getMoreResults());
+ assertEquals(-1, stmt.getUpdateCount());
+ // One more time
+ assertFalse(stmt.getMoreResults());
+
+ // Execute a multi-statement block
+ haveResultSet = stmt.execute("SELECT 1; SELECT 2;
SELECT 3");
+ // First result set
+ assertTrue(haveResultSet);
+ // Second result set
+ assertTrue(stmt.getMoreResults());
+ // Third result set
+ assertTrue(stmt.getMoreResults());
+ // No fourth result set
+ assertFalse(stmt.getMoreResults());
+ assertEquals(-1, stmt.getUpdateCount());
+ // One more time
+ assertFalse(stmt.getMoreResults());
+ }
+ }
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
