Merge pull request #1007 from hazendaz/master

[tests] Ensure resources are closed fixing sonar issues

Author: hazendaz

src/test/java/org/apache/ibatis/autoconstructor/AutoConstructorTest.java

@@ -47,6 +47,7 @@ public static void setUp() throws Exception {
     final ScriptRunner runner = new ScriptRunner(conn);
     runner.setLogWriter(null);
     runner.runScript(dbReader);
+    conn.close();
     dbReader.close();
     session.close();
   }

src/test/java/org/apache/ibatis/binding/BindingTest.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2016 the original author or authors.
+ *    Copyright 2009-2017 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
+import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -53,6 +54,7 @@
 import org.apache.ibatis.session.SqlSessionFactoryBuilder;
 import org.apache.ibatis.transaction.TransactionFactory;
 import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
+import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -784,6 +786,9 @@ public void executeWithCursorAndRowBounds() {
       assertEquals(2, blog.getId());
       assertFalse(blogIterator.hasNext());
 
+      blogs.close();
+    } catch (IOException e) {
+      Assert.fail(e.getMessage());
     } finally {
       session.close();
     }

src/test/java/org/apache/ibatis/binding/MapperWithOneAndMany.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2015 the original author or authors.
+ *    Copyright 2009-2017 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -25,17 +25,17 @@
 import org.apache.ibatis.domain.blog.Blog;
 
 public interface MapperWithOneAndMany {
-    
-    @Select({
-        "SELECT *",
-        "FROM blog"
-    })
-    @Results({ 
-        @Result(
-               property = "author", column = "author_id", 
-               one = @One(select = "org.apache.ibatis.binding.BoundAuthorMapper.selectAuthor"), 
-               many = @Many(select = "selectPostsById"))
-    })
-    List<Blog> selectWithBothOneAndMany();    
-    
+
+  @Select({
+    "SELECT *",
+    "FROM blog"
+  })
+  @Results({ 
+    @Result(
+       property = "author", column = "author_id", 
+       one = @One(select = "org.apache.ibatis.binding.BoundAuthorMapper.selectAuthor"),
+       many = @Many(select = "selectPostsById"))
+  })
+  List<Blog> selectWithBothOneAndMany();
+
 }

src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2016 the original author or authors.
+ *    Copyright 2009-2017 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -88,6 +88,7 @@ public void ShouldReturnRealConnection() throws Exception {
     PooledDataSource ds = createPooledDataSource(JPETSTORE_PROPERTIES);
     Connection c = ds.getConnection();
     JDBCConnection realConnection = (JDBCConnection) PooledDataSource.unwrapConnection(c);
+    c.close();
   }
 
   @Ignore("See the comments")
@@ -104,7 +105,6 @@ public void shouldReconnectWhenServerKilledLeakedConnection() throws Exception {
     final String USERNAME = "admin";
     final String PASSWORD = "";
 
-    Connection con;
     PooledDataSource ds = new PooledDataSource();
     ds.setDriver("com.mysql.jdbc.Driver");
     ds.setUrl(URL);
@@ -120,14 +120,16 @@ public void shouldReconnectWhenServerKilledLeakedConnection() throws Exception {
     // MySQL wait_timeout * 1000 or less. (unit:ms)
     ds.setPoolPingConnectionsNotUsedFor(1000);
 
-    con = ds.getConnection();
+    Connection con = ds.getConnection();
     exexuteQuery(con);
     // Simulate connection leak by not closing.
     // con.close();
 
     // Wait for disconnected from mysql...
     Thread.sleep(TimeUnit.SECONDS.toMillis(3));
 
+    con.close();
+
     // Should return usable connection.
     con = ds.getConnection();
     exexuteQuery(con);

src/test/java/org/apache/ibatis/jdbc/ScriptRunnerTest.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2015 the original author or authors.
+ *    Copyright 2009-2017 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -49,6 +49,7 @@ public void shouldRunScriptsBySendingFullScriptAtOnce() throws Exception {
     runner.setStopOnError(false);
     runner.setErrorLogWriter(null);
     runner.setLogWriter(null);
+    conn.close();
     runJPetStoreScripts(runner);
     assertProductsTableExistsAndLoaded();
   }
@@ -63,6 +64,7 @@ public void shouldRunScriptsUsingConnection() throws Exception {
     runner.setErrorLogWriter(null);
     runner.setLogWriter(null);
     runJPetStoreScripts(runner);
+    conn.close();
     assertProductsTableExistsAndLoaded();
   }
 
@@ -102,6 +104,8 @@ public void shouldReturnWarningIfEndOfLineTerminatorNotFound() throws Exception
     } catch (Exception e) {
       assertTrue(e.getMessage().contains("end-of-line terminator"));
     }
+    reader.close();
+    conn.close();
   }
 
   @Test
@@ -123,6 +127,8 @@ public void commentAferStatementDelimiterShouldNotCauseRunnerFail() throws Excep
     } catch (Exception e) {
       fail(e.getMessage());
     }
+    reader.close();
+    conn.close();
   }
 
   @Test
@@ -144,6 +150,8 @@ public void shouldReturnWarningIfNotTheCurrentDelimiterUsed() throws Exception {
     } catch (Exception e) {
       assertTrue(e.getMessage().contains("end-of-line terminator"));
     }
+    reader.close();
+    conn.close();
   }
 
   @Test
@@ -165,6 +173,8 @@ public void changingDelimiterShouldNotCauseRunnerFail() throws Exception {
     } catch (Exception e) {
       fail(e.getMessage());
     }
+    reader.close();
+    conn.close();
   }
 
   @Test
@@ -182,6 +192,7 @@ public void testLogging() throws Exception {
 
     Reader reader = new StringReader("select userid from account where userid = 'j2ee';");
     runner.runScript(reader);
+    conn.close();
 
     assertEquals(
             "select userid from account where userid = 'j2ee'" + System.getProperty("line.separator")
@@ -204,6 +215,7 @@ public void testLoggingFullScipt() throws Exception {
 
     Reader reader = new StringReader("select userid from account where userid = 'j2ee';");
     runner.runScript(reader);
+    conn.close();
 
     assertEquals(
             "select userid from account where userid = 'j2ee';" + System.getProperty("line.separator")
@@ -223,6 +235,7 @@ private void assertProductsTableExistsAndLoaded() throws IOException, SQLExcepti
       SqlRunner executor = new SqlRunner(conn);
       List<Map<String, Object>> products = executor.selectAll("SELECT * FROM PRODUCT");
       assertEquals(16, products.size());
+      conn.close();
     } finally {
       ds.forceCloseAll();
     }

src/test/java/org/apache/ibatis/parsing/XPathParserTest.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2015 the original author or authors.
+ *    Copyright 2009-2017 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -41,6 +41,7 @@ public void shouldTestXPathParserMethods() throws Exception {
     XNode node = parser.evalNode("/employee/height");
     assertEquals("employee/height", node.getPath());
     assertEquals("employee[${id_var}]_height", node.getValueBasedIdentifier());
+    inputStream.close();
   }
 
 }

src/test/java/org/apache/ibatis/submitted/ancestor_ref/AncestorRefTest.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2016 the original author or authors.
+ *    Copyright 2009-2017 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -45,6 +45,7 @@ public static void setUp() throws Exception {
     ScriptRunner runner = new ScriptRunner(conn);
     runner.setLogWriter(null);
     runner.runScript(reader);
+    conn.close();
     reader.close();
     session.close();
   }

src/test/java/org/apache/ibatis/submitted/array_result_type/ArrayResultTypeTest.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2016 the original author or authors.
+ *    Copyright 2009-2017 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -46,6 +46,7 @@ public static void setUp() throws Exception {
     ScriptRunner runner = new ScriptRunner(conn);
     runner.setLogWriter(null);
     runner.runScript(reader);
+    conn.close();
     reader.close();
     session.close();
   }

src/test/java/org/apache/ibatis/submitted/association_nested/FolderMapperTest.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2015 the original author or authors.
+ *    Copyright 2009-2017 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -46,6 +46,9 @@ public void testFindWithChildren() throws Exception {
     stmt.execute("insert into folder values(4, 'Folder 2_1', 3)");
     stmt.execute("insert into folder values(5, 'Folder 2_2', 3)");
 
+    stmt.close();
+    conn.close();
+
     /**
      * Root/
      *    Folder 1/
@@ -65,6 +68,7 @@ public void testFindWithChildren() throws Exception {
 
     Assert.assertEquals(3, folders.size());
 
+    inputStream.close();
     session.close();
   }
 

src/test/java/org/apache/ibatis/submitted/associationtest/AssociationTest.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2015 the original author or authors.
+ *    Copyright 2009-2017 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -46,6 +46,7 @@ public static void setUp() throws Exception {
     ScriptRunner runner = new ScriptRunner(conn);
     runner.setLogWriter(null);
     runner.runScript(reader);
+    conn.close();
     reader.close();
     session.close();
   }