monetdb-java: default - Comments and naming tweaks

[Joeri van Ruth via checkin-list]

Changeset: 82de09eedfef for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java/rev/82de09eedfef
Modified Files:
        src/test/java/org/monetdb/jdbc/ApiTests.java
        src/test/java/org/monetdb/jdbc/FileTransferHandlerTests.java
        src/test/java/org/monetdb/jdbc/OnClientTests.java
        src/test/java/org/monetdb/testinfra/MonetVersionNumber.java
Branch: default
Log Message:

Comments and naming tweaks


diffs (106 lines):

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
@@ -79,7 +79,7 @@ public class ApiTests {
                }
                assertTrue(conn.getAutoCommit());
 
-               if (monetVersion.serverCanQueryUnclosedResultSets()) {
+               if (monetVersion.canQueryUnclosedResultSets()) {
                        ArrayList<String> unclosed = new ArrayList<>();
                        String query = "SELECT 'query_id=' || query_id || 
'/res_id=' || res_id FROM sys.unclosed_result_sets()";
                        try (ResultSet rs = stmt.executeQuery(query)) {
@@ -194,10 +194,20 @@ public class ApiTests {
                }
        }
 
+       /**
+        * Execute SQL code using this instances' {@link stmt} Statement
+        * and ignore any SQLExceptions it may throw.
+        * @param sql statements to execute
+        */
        private void ignoreFailures(String sql) {
                ignoreFailures(() -> stmt.execute(sql));
        }
 
+       /**
+        * Execute the callback using this instances' {@link stmt} Statement
+        * and ignore any SQLExceptions it may throw.
+        * @param func callback to execute
+        */
        private void ignoreFailures(Assertions.SQLCode func) {
                try {
                        func.execute();
@@ -978,7 +988,7 @@ public class ApiTests {
                        assertEquals("double", md.getColumnTypeName(3));
                        assertEquals("boolean", md.getColumnTypeName(4));
                        assertEquals("varchar", md.getColumnTypeName(5));
-                       if (monetVersion.serverReturnsNewMetadata())
+                       if (monetVersion.returnsNewMetadata())
                                assertEquals("varchar", 
md.getColumnTypeName(6));
                        else
                                assertEquals("clob", md.getColumnTypeName(6));
diff --git a/src/test/java/org/monetdb/jdbc/FileTransferHandlerTests.java 
b/src/test/java/org/monetdb/jdbc/FileTransferHandlerTests.java
--- a/src/test/java/org/monetdb/jdbc/FileTransferHandlerTests.java
+++ b/src/test/java/org/monetdb/jdbc/FileTransferHandlerTests.java
@@ -182,7 +182,7 @@ public class FileTransferHandlerTests ex
                conn.setDownloadHandler(new FileTransferHandler(tempDir2, 
StandardCharsets.UTF_8));
                String quoted = 
tempDir1.resolve("data.txt").toAbsolutePath().toString().replaceAll("'", "''");
                assertSQLException("not in download directory", () -> 
stmt.execute("COPY SELECT * FROM foo INTO R'" + quoted + "' ON CLIENT"));
-               if (monetVersion.serverCanRefuseDownload()) {
+               if (monetVersion.canRefuseDownload()) {
                        // connection is still alive
                        assertEquals(42, queryInt("SELECT SUM(i) FROM foo"));
                }
diff --git a/src/test/java/org/monetdb/jdbc/OnClientTests.java 
b/src/test/java/org/monetdb/jdbc/OnClientTests.java
--- a/src/test/java/org/monetdb/jdbc/OnClientTests.java
+++ b/src/test/java/org/monetdb/jdbc/OnClientTests.java
@@ -238,7 +238,7 @@ public class OnClientTests extends OnCli
                conn.setDownloadHandler(handler);
                stmt.executeUpdate("INSERT INTO foo SELECT value as i, 'number' 
|| value AS t FROM sys.generate_series(0, 100)");
                assertSQLException("download refused", () -> 
stmt.executeUpdate("COPY (SELECT * FROM foo) INTO 'banana' ON CLIENT"));
-               if (monetVersion.serverCanRefuseDownload())
+               if (monetVersion.canRefuseDownload())
                        assertEquals(100, queryInt("SELECT COUNT(*) FROM foo"));
                else
                        // Wish it were different but the server closes the 
connection
diff --git a/src/test/java/org/monetdb/testinfra/MonetVersionNumber.java 
b/src/test/java/org/monetdb/testinfra/MonetVersionNumber.java
--- a/src/test/java/org/monetdb/testinfra/MonetVersionNumber.java
+++ b/src/test/java/org/monetdb/testinfra/MonetVersionNumber.java
@@ -66,7 +66,7 @@ public class MonetVersionNumber {
         *
         * @return
         */
-       public boolean serverCanRefuseDownload() {
+       public boolean canRefuseDownload() {
                return isAtLeast(11, 41, 12);
        }
 
@@ -75,7 +75,8 @@ public class MonetVersionNumber {
         *
         * @return
         */
-       public boolean serverCanQueryUnclosedResultSets() {
+       public boolean canQueryUnclosedResultSets() {
+
                return isAtLeast(11, 52, 0);
        }
 
@@ -85,7 +86,7 @@ public class MonetVersionNumber {
         * From version 11.50 on, the MonetDB server returns different metadata 
for
         * integer digits (1 less) and for clob and char columns (now return 
varchar).
         */
-       public boolean serverReturnsNewMetadata() {
+       public boolean returnsNewMetadata() {
                return isAtLeast(11, 50, 0);
        }
 
@@ -99,4 +100,8 @@ public class MonetVersionNumber {
        public boolean planHasBecomeExplain() {
                return isAtLeast(11, 54, 00);
        }
+
+       public boolean hasAccurateAutocommitStatus() {
+               return isAtLeast(56, 0, 00);
+       }
 }
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org