From d4caabaa13f79765057a0a06465213ccc124f30c Mon Sep 17 00:00:00 2001
From: Brett Wooldridge <brett.wooldridge@gmail.com>
Date: Fri, 17 Jan 2014 16:12:19 +0900
Subject: [PATCH] More testy stuff.

---
 .../java/com/zaxxer/hikari/StatementTest.java | 46 ++++++++++++++++++-
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/src/test/java/com/zaxxer/hikari/StatementTest.java b/src/test/java/com/zaxxer/hikari/StatementTest.java
index bf9a22b8..9a458403 100644
--- a/src/test/java/com/zaxxer/hikari/StatementTest.java
+++ b/src/test/java/com/zaxxer/hikari/StatementTest.java
@@ -1,7 +1,6 @@
 package com.zaxxer.hikari;
 
 import java.sql.Connection;
-import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 
@@ -40,7 +39,7 @@ public class StatementTest
     }
 
     @Test
-    public void testDoubleStatementClose() throws SQLException
+    public void testAutoStatementClose() throws SQLException
     {
         HikariConfig config = new HikariConfig();
         config.setMinimumPoolSize(1);
@@ -63,4 +62,47 @@ public class StatementTest
         Assert.assertTrue(statement1.isClosed());
         Assert.assertTrue(statement2.isClosed());
     }
+
+    @Test
+    public void testDoubleStatementClose() throws SQLException
+    {
+        HikariConfig config = new HikariConfig();
+        config.setMinimumPoolSize(1);
+        config.setMaximumPoolSize(2);
+        config.setAcquireIncrement(1);
+        config.setConnectionTestQuery("VALUES 1");
+        config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
+
+        HikariDataSource ds = new HikariDataSource(config);
+        Connection connection = ds.getConnection();
+
+        Statement statement1 = connection.createStatement();
+
+        statement1.close();
+        statement1.close();
+
+        connection.close();
+    }
+
+    @Test
+    public void testOutOfOrderStatementClose() throws SQLException
+    {
+        HikariConfig config = new HikariConfig();
+        config.setMinimumPoolSize(1);
+        config.setMaximumPoolSize(2);
+        config.setAcquireIncrement(1);
+        config.setConnectionTestQuery("VALUES 1");
+        config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
+
+        HikariDataSource ds = new HikariDataSource(config);
+        Connection connection = ds.getConnection();
+
+        Statement statement1 = connection.createStatement();
+        Statement statement2 = connection.createStatement();
+
+        statement1.close();
+        statement2.close();
+
+        connection.close();
+    }    
 }