Changeset: 2b828cd0ad28 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2b828cd0ad28
Modified Files:
        java/tests/Test_CisValid.java
        sql/jdbc/tests/Tests/Test_CisValid.stable.err
Branch: Jun2016
Log Message:

Making output stable (independent of source code line numbers) by
replacing e.printStackTrace() with standard System.err.println(e)
Also enclosed the test of conn.isValid() and conn.rolback() in separate
try-catch such that any error is catched and reported.


diffs (49 lines):

diff --git a/java/tests/Test_CisValid.java b/java/tests/Test_CisValid.java
--- a/java/tests/Test_CisValid.java
+++ b/java/tests/Test_CisValid.java
@@ -18,15 +18,23 @@ public class Test_CisValid {
                Connection conn = DriverManager.getConnection(args[0]);
                Statement stmt = conn.createStatement();
 
-               conn.setAutoCommit(false); // start a transaction
                try {
+                       conn.setAutoCommit(false); // start a transaction
                        stmt.execute("SELECT COUNT(*) FROM doesnotexist;"); // 
let's trigger an error
                } catch (SQLException e) {
-                       e.printStackTrace();
-                       System.out.println("Validating connection: 
conn.isValid? " + conn.isValid(30)); // Can we rollback on this connection?
-                       conn.rollback();
+                       // e.printStackTrace();
+                       System.err.println("Expected error: " + e);
+
+                       try {
+                               // test calling conn.isValid()
+                               System.out.println("Validating connection: 
conn.isValid? " + conn.isValid(30));
+                               // Can we rollback on this connection without 
causing an error?
+                               conn.rollback();
+                       } catch (SQLException e2) {
+                               System.err.println("UnExpected error: " + e2);
+                       }
                }
-                       
+
                stmt.close();
                conn.close();
        }
diff --git a/sql/jdbc/tests/Tests/Test_CisValid.stable.err 
b/sql/jdbc/tests/Tests/Test_CisValid.stable.err
--- a/sql/jdbc/tests/Tests/Test_CisValid.stable.err
+++ b/sql/jdbc/tests/Tests/Test_CisValid.stable.err
@@ -35,12 +35,7 @@ stderr of test 'Test_CisValid` in direct
 # 23:03:08 >  java Test_CisValid 
"jdbc:monetdb://toulouse:36086/mTests_sql_jdbc_tests?user=monetdb&password=monetdb"
 # 23:03:08 >  
 
-java.sql.SQLException: SELECT: no such table 'doesnotexist'
-       at 
nl.cwi.monetdb.jdbc.MonetConnection$ResponseList.executeQuery(MonetConnection.java:2602)
-       at 
nl.cwi.monetdb.jdbc.MonetConnection$ResponseList.processQuery(MonetConnection.java:2350)
-       at 
nl.cwi.monetdb.jdbc.MonetStatement.internalExecute(MonetStatement.java:507)
-       at nl.cwi.monetdb.jdbc.MonetStatement.execute(MonetStatement.java:345)
-       at Test_CisValid.main(Test_CisValid.java:23)
+Expected error: java.sql.SQLException: SELECT: no such table 'doesnotexist'
 
 # 23:03:08 >  
 # 23:03:08 >  "Done."
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to