Convert Bug_IsValid_Timeout_Bug_6782() -> ApiTests#testIsValidTimeoutBug6782()

Author: joerivanruth

src/test/java/JDBC_API_Tester.java

@@ -2191,48 +2191,6 @@ public void BugDecimalRound_Bug_3561() {
 				"null\n");
 	}
 
-	@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

src/test/java/org/monetdb/jdbc/ApiTests.java

@@ -1978,4 +1978,34 @@ public void testBug3350() throws SQLException {
 			});
 		}
 	}
+
+	@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();
+		}
+	}
 }