Changeset: 4d290cb3c522 for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java/rev/4d290cb3c522
Modified Files:
src/test/java/JDBC_API_Tester.java
src/test/java/org/monetdb/jdbc/ApiTests.java
Branch: default
Log Message:
Convert Bug_IsValid_Timeout_Bug_6782() -> ApiTests#testIsValidTimeoutBug6782()
diffs (90 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
@@ -2192,48 +2192,6 @@ public final class JDBC_API_Tester exten
}
@Test
- public void Bug_IsValid_Timeout_Bug_6782() {
- sb.setLength(0); // clear the output log buffer
-
- Connection con2 = null;
- Statement st = null;
- try {
- con2 = DriverManager.getConnection(jdbcUrl);
- sb.append("connected :)\n");
-
- st = con2.createStatement();
- st.setQueryTimeout(5);
- sb.append("getQueryTimeout must give 5:
").append(st.getQueryTimeout()).append("\n");
- st.close();
-
- con.isValid(6);
-
- st = con.createStatement();
- sb.append("getQueryTimeout must give 0:
").append(st.getQueryTimeout()).append("\n");
-
- con.isValid(4);
- sb.append("getQueryTimeout must give 0:
").append(st.getQueryTimeout()).append("\n");
- st.close();
-
- st.setQueryTimeout(7);
- con.isValid(3);
- sb.append("getQueryTimeout must give 7:
").append(st.getQueryTimeout()).append("\n");
- st.close();
- } catch (SQLException se) {
- sb.append(se.getMessage()).append("\n");
- }
- closeStmtResSet(st, null);
- closeConx(con2);
-
- compareExpectedOutput("Bug_IsValid_Timeout_Bug_6782",
- "connected :)\n" +
- "getQueryTimeout must give 5: 5\n" +
- "getQueryTimeout must give 0: 0\n" +
- "getQueryTimeout must give 0: 0\n" +
- "getQueryTimeout must give 7: 7\n");
- }
-
- @Test
public void Bug_LargeQueries_6571_6693() {
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
@@ -1978,4 +1978,34 @@ public class ApiTests {
});
}
}
+
+ @Test
+public void testIsValidTimeoutBug6782() throws SQLException {
+ try (Connection conn2 = newConnection()) {
+ Statement st;
+
+ // Here 'st' is conn2's
+ st = conn2.createStatement();
+ st.setQueryTimeout(5);
+ assertEquals(5, st.getQueryTimeout());
+ st.close();
+
+ conn.isValid(6);
+ // Here, 'st' is conn's
+ st = conn.createStatement();
+ assertEquals(0, st.getQueryTimeout());
+
+ conn.isValid(4);
+ assertEquals(0, st.getQueryTimeout());
+ st.close();
+
+ // Here, 'st' is used after closing ????
+ st.setQueryTimeout(7);
+ conn.isValid(3);
+ assertEquals(7, st.getQueryTimeout());
+
+ // Here, 'st' is closed a second time. what are we
testing here?
+ st.close();
+ }
+ }
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
