Merge pull request #563 from andreitokar/issue#556.2

Issue#556 close connections in tests (at least in case of successful execution)

h2/src/test/org/h2/test/db/TestFullText.java

@@ -23,6 +23,7 @@ import java.util.concurrent.TimeUnit;
 import org.h2.fulltext.FullText;
 import org.h2.store.fs.FileUtils;
 import org.h2.test.TestBase;
+import org.h2.util.IOUtils;
 import org.h2.util.Task;
 
 /**
@@ -90,9 +91,9 @@ public class TestFullText extends TestBase {
         deleteDb("fullTextReopen");
     }
 
-    private static void close(Collection<Connection> list) throws SQLException {
+    private static void close(Collection<Connection> list) {
         for (Connection conn : list) {
-            conn.close();
+            IOUtils.closeSilently(conn);
         }
     }
 
@@ -491,8 +492,7 @@ public class TestFullText extends TestBase {
             return;
         }
         deleteDb("fullText");
-        ArrayList<Connection> connList = new ArrayList<Connection>();
-        Connection conn = getConnection("fullText", connList);
+        Connection conn = getConnection("fullText");
         String prefix = lucene ? "FTL_" : "FT_";
         Statement stat = conn.createStatement();
         String className = lucene ? "FullTextLucene" : "FullText";
@@ -590,15 +590,15 @@ public class TestFullText extends TestBase {
 
         if (!config.memory) {
             conn.close();
+            conn = getConnection("fullText");
         }
 
-        conn = getConnection("fullText", connList);
         stat = conn.createStatement();
         stat.executeQuery("SELECT * FROM " + prefix + "SEARCH('World', 0, 0)");
 
         stat.execute("CALL " + prefix + "DROP_ALL()");
 
-        close(connList);
+        conn.close();
     }
 
     private void testDropIndex(boolean lucene) throws SQLException {
@@ -625,7 +625,6 @@ public class TestFullText extends TestBase {
                 "_CREATE_INDEX('PUBLIC', 'TEST', 'NAME1, NAME2')");
         stat.execute("UPDATE TEST SET NAME2=NULL WHERE ID=1");
         stat.execute("UPDATE TEST SET NAME2='Hello World' WHERE ID=1");
-        conn.close();
 
         conn.close();
         FileUtils.deleteRecursive(getBaseDir() + "/fullTextDropIndex", false);

h2/src/test/org/h2/test/db/TestFunctions.java

@@ -1285,6 +1285,7 @@ public class TestFunctions extends TestBase implements AggregateFunction {
                 String.format("SELECT ORA_HASH('%s', 0) FROM DUAL", testStr));
         assertResult(String.valueOf("foo".hashCode()), stat,
                 String.format("SELECT ORA_HASH('%s', 0, 0) FROM DUAL", testStr));
+        conn.close();
     }
 
     private void testToDateException() {
@@ -2058,6 +2059,7 @@ public class TestFunctions extends TestBase implements AggregateFunction {
 
         assertFalse(parsed.before(before));
         assertFalse(parsed.after(after));
+        conn.close();
     }
 
 
@@ -2083,6 +2085,7 @@ public class TestFunctions extends TestBase implements AggregateFunction {
         rs.close();
 
         assertEquals(first, second);
+        conn.close();
     }
 
     private void testThatCurrentTimestampUpdatesOutsideATransaction()
@@ -2107,11 +2110,12 @@ public class TestFunctions extends TestBase implements AggregateFunction {
         rs.close();
 
         assertTrue(second.after(first));
+        conn.close();
     }
 
     private void callCompiledFunction(String functionName) throws SQLException {
         deleteDb("functions");
-        Connection conn = getConnection("functions");
+        try (Connection conn = getConnection("functions")) {
             Statement stat = conn.createStatement();
             ResultSet rs;
             stat.execute("create alias " + functionName + " AS "
@@ -2125,8 +2129,7 @@ public class TestFunctions extends TestBase implements AggregateFunction {
             assertEquals(Boolean.class.getName(), rs.getObject(1).getClass().getName());
 
             stat.execute("drop alias " + functionName + "");
-
-        conn.close();
+        }
     }
 
     private void assertCallResult(String expected, Statement stat, String sql)

h2/src/test/org/h2/test/db/TestQueryCache.java

@@ -36,7 +36,7 @@ public class TestQueryCache extends TestBase {
     }
 
     private void test1() throws Exception {
-        Connection conn = getConnection("queryCache;QUERY_CACHE_SIZE=10");
+        try (Connection conn = getConnection("queryCache;QUERY_CACHE_SIZE=10")) {
             Statement stat = conn.createStatement();
             stat.execute("create table test(id int, name varchar)");
             PreparedStatement prep;
@@ -91,11 +91,11 @@ public class TestQueryCache extends TestBase {
             // usually this is true
             assertSmaller(firstSmaller, firstGreater);
             stat.execute("drop table test");
-        conn.close();
+        }
     }
 
     private void testClearingCacheWithTableStructureChanges() throws Exception {
-        Connection conn = getConnection("queryCache;QUERY_CACHE_SIZE=10");
+        try (Connection conn = getConnection("queryCache;QUERY_CACHE_SIZE=10")) {
             assertThrows(ErrorCode.TABLE_OR_VIEW_NOT_FOUND_1, conn).
                     prepareStatement("SELECT * FROM TEST");
             Statement stat = conn.createStatement();
@@ -105,6 +105,6 @@ public class TestQueryCache extends TestBase {
             stat.executeUpdate("DROP TABLE TEST");
             assertThrows(ErrorCode.TABLE_OR_VIEW_NOT_FOUND_1, conn).
                     prepareStatement("SELECT * FROM TEST");
-        conn.close();
+        }
     }
 }

h2/src/test/org/h2/test/db/TestShow.java

@@ -33,7 +33,7 @@ public class TestShow extends TestBase {
     }
 
     private void testPgCompatibility() throws SQLException {
-        Connection conn = getConnection("mem:pg");
+        try (Connection conn = getConnection("mem:pg")) {
             Statement stat = conn.createStatement();
 
             assertResult("UNICODE", stat, "SHOW CLIENT_ENCODING");
@@ -43,9 +43,10 @@ public class TestShow extends TestBase {
             assertResult("8.1.4", stat, "SHOW SERVER_VERSION");
             assertResult("UTF8", stat, "SHOW SERVER_ENCODING");
         }
+    }
 
     private void testMysqlCompatibility() throws SQLException {
-        Connection conn = getConnection("mem:pg");
+        try (Connection conn = getConnection("mem:pg")) {
             Statement stat = conn.createStatement();
             ResultSet rs;
 
@@ -63,4 +64,5 @@ public class TestShow extends TestBase {
             // columns
             assertResultRowCount(2, stat.executeQuery("SHOW COLUMNS FROM person"));
         }
+    }
 }

h2/src/test/org/h2/test/db/TestSpatial.java

@@ -1064,7 +1064,7 @@ public class TestSpatial extends TestBase {
 
     private void testInsertNull() throws SQLException {
         deleteDb("spatial");
-        Connection conn = getConnection(URL);
+        try (Connection conn = getConnection(URL)) {
             Statement stat = conn.createStatement();
             stat.execute("\n" +
                 "drop table if exists PUBLIC.DUMMY_12;\n" +
@@ -1137,12 +1137,13 @@ public class TestSpatial extends TestBase {
             try (ResultSet rs = stat.executeQuery("select * from DUMMY_12")) {
                 assertTrue(rs.next());
             }
-
+        }
+        deleteDb("spatial");
     }
 
     private void testSpatialIndexWithOrder() throws SQLException {
         deleteDb("spatial");
-        Connection conn = getConnection(URL);
+        try (Connection conn = getConnection(URL)) {
             Statement stat = conn.createStatement();
             stat.execute("DROP TABLE IF EXISTS BUILDINGS;" +
                    "CREATE TABLE BUILDINGS (PK serial, THE_GEOM geometry);" +
@@ -1156,4 +1157,6 @@ public class TestSpatial extends TestBase {
                 assertTrue(rs.getString(1).contains("PRIMARY_KEY"));
             }
         }
+        deleteDb("spatial");
+    }
 }

h2/src/test/org/h2/test/jdbc/TestConnection.java

@@ -45,6 +45,7 @@ public class TestConnection extends TestBase {
 
         assertThrows(SQLClientInfoException.class, conn).setClientInfo("numServers", "SomeValue");
         assertThrows(SQLClientInfoException.class, conn).setClientInfo("server23", "SomeValue");
+        conn.close();
     }
 
     private void testSetUnsupportedClientInfoProperties() throws SQLException {
@@ -54,6 +55,7 @@ public class TestConnection extends TestBase {
         properties.put("ClientUser", "someUser");
 
         assertThrows(SQLClientInfoException.class, conn).setClientInfo(properties);
+        conn.close();
     }
 
     private void testSetSupportedClientInfoProperties() throws SQLException {
@@ -67,6 +69,7 @@ public class TestConnection extends TestBase {
         assertNull(conn.getClientInfo("ApplicationName"));
         // new property has been set
         assertEquals(conn.getClientInfo("ClientUser"), "someUser");
+        conn.close();
     }
 
     private void testSetSupportedClientInfo() throws SQLException {
@@ -74,17 +77,20 @@ public class TestConnection extends TestBase {
         conn.setClientInfo("ApplicationName", "Connection Test");
 
         assertEquals(conn.getClientInfo("ApplicationName"), "Connection Test");
+        conn.close();
     }
 
     private void testSetUnsupportedClientInfo() throws SQLException {
         Connection conn = getConnection("clientInfoDB2;MODE=DB2");
         assertThrows(SQLClientInfoException.class, conn).setClientInfo(
                 "UnsupportedName", "SomeValue");
+        conn.close();
     }
 
     private void testGetUnsupportedClientInfo() throws SQLException {
         Connection conn = getConnection("clientInfo");
         assertNull(conn.getClientInfo("UnknownProperty"));
+        conn.close();
     }
 
     private void testSetGetSchema() throws SQLException {