Changeset: dd240e511765 for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java/rev/dd240e511765
Modified Files:
src/test/java/JDBC_API_Tester.java
src/test/java/org/monetdb/jdbc/ApiTests.java
Branch: default
Log Message:
Convert Test_CisValid() -> ApiTests#testIsValid()
diffs (78 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
@@ -175,42 +175,6 @@ public final class JDBC_API_Tester exten
}
@Test
- public void Test_CisValid() {
- sb.setLength(0); // clear the output log buffer
-
- Statement stmt = null;
- try {
- stmt = con.createStatement();
- con.setAutoCommit(false); // start a transaction
- stmt.executeQuery("SELECT COUNT(*) FROM
doesnotexist;"); // let's trigger an error
- } catch (SQLException e) {
- // e.printStackTrace();
- sb.append("Expected error: ").append(e).append("\n");
- try {
- // test calling conn.isValid()
- sb.append("Validating connection: con.isValid?
").append(con.isValid(30));
- // Can we rollback on this connection without
causing an error?
- con.rollback();
- } catch (SQLException e2) {
- sb.append("UnExpected error: ").append(e2);
- }
- }
-
- try {
- // restore auto commit mode
- con.setAutoCommit(true);
- } catch (SQLException e) {
- sb.append("FAILED:
").append(e.getMessage()).append("\n");
- }
-
- closeStmtResSet(stmt, null);
-
- compareExpectedOutput("Test_CisValid",
- "Expected error: java.sql.SQLException: SELECT:
no such table 'doesnotexist'\n" +
- "Validating connection: con.isValid? true");
- }
-
- @Test
public void Test_Clargequery() {
sb.setLength(0); // clear the output log buffer
final String query =
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
@@ -9,6 +9,7 @@ import java.sql.*;
import java.util.ArrayList;
import static org.junit.jupiter.api.Assertions.*;
+import static org.monetdb.testinfra.Assertions.assertSQLException;
/**
* Tests migrated from JDBC_API_Testser
@@ -120,5 +121,20 @@ public class ApiTests {
}
}
+ @Test
+ public void testIsValid() throws SQLException {
+ // initially valid
+ assertTrue(conn.isValid(30));
+
+ // still valid after exception
+ conn.setAutoCommit(false);
+ assertSQLException("no such table", () ->
stmt.executeQuery("SELECT COUNT(*) FROM doesnotexist"));
+ assertTrue(conn.isValid(30));
+
+ // leave clean connection
+ conn.rollback();
+ conn.setAutoCommit(true);
+ }
+
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
