More code coverage tests.

hikaricp-java6/src/test/java/com/zaxxer/hikari/TestConcurrentBag.java

@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2013 Brett Wooldridge
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.zaxxer.hikari;
+
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.zaxxer.hikari.pool.PoolBagEntry;
+import com.zaxxer.hikari.util.ConcurrentBag;
+
+/**
+ *
+ * @author Brett Wooldridge
+ */
+public class TestConcurrentBag
+{
+   @Test
+   public void testConcurrentBag() throws InterruptedException
+   {
+      ConcurrentBag<PoolBagEntry> bag = new ConcurrentBag<PoolBagEntry>(null);
+      Assert.assertEquals(0, bag.values(8).size());
+
+      PoolBagEntry reserved = new PoolBagEntry(null, 0);
+      bag.add(reserved);
+      bag.reserve(reserved);      // reserved
+
+      PoolBagEntry inuse = new PoolBagEntry(null, 0);
+      bag.add(inuse);
+      bag.borrow(2L, TimeUnit.SECONDS); // in use
+      
+      PoolBagEntry notinuse = new PoolBagEntry(null, 0);
+      bag.add(notinuse); // not in use
+      
+      bag.dumpState();
+
+      try {
+         bag.requite(reserved);
+         Assert.fail();
+      }
+      catch (IllegalStateException e) {
+         // pass
+      }
+
+      try {
+         bag.remove(notinuse);
+         Assert.fail();
+      }
+      catch (IllegalStateException e) {
+         // pass
+      }
+
+      try {
+         bag.unreserve(notinuse);
+         Assert.fail();
+      }
+      catch (IllegalStateException e) {
+         // pass
+      }
+
+      try {
+         bag.remove(inuse);
+         bag.remove(inuse);
+         Assert.fail();
+      }
+      catch (IllegalStateException e) {
+         // pass
+      }
+
+      bag.close();
+      try {
+         bag.add(new PoolBagEntry(null, 0));
+         Assert.fail();
+      }
+      catch (IllegalStateException e) {
+         // pass
+      }
+
+      Assert.assertNotNull(notinuse.toString());
+   }
+}

hikaricp-java6/src/test/java/com/zaxxer/hikari/TestElf.java

@@ -61,12 +61,12 @@ public final class TestElf
       }
    }
 
-   public static void setConfigUnitTest()
+   public static void setConfigUnitTest(boolean unitTest)
    {
       try {
          Field field = HikariConfig.class.getDeclaredField("unitTest");
          field.setAccessible(true);
-         field.setBoolean(null, true);
+         field.setBoolean(null, unitTest);
       }
       catch (Exception e) {
          throw new RuntimeException(e);

hikaricp-java6/src/test/java/com/zaxxer/hikari/TestJNDI.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2014 Brett Wooldridge
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.zaxxer.hikari;
 
 import javax.naming.Context;
@@ -53,6 +68,22 @@ public class TestJNDI
       Assert.assertEquals("foo", ds.getUsername());
    }
 
+   @Test
+   public void testJndiLookup3() throws Exception
+   {
+      HikariJNDIFactory jndi = new HikariJNDIFactory();
+
+      Reference ref = new Reference("javax.sql.DataSource");
+      ref.add(new BogusRef("dataSourceJNDI", "java:comp/env/HikariDS"));
+      try {
+         jndi.getObjectInstance(ref, null, null, null);
+         Assert.fail();
+      }
+      catch (RuntimeException e) {
+         Assert.assertTrue(e.getMessage().contains("JNDI context is null"));
+      }
+   }
+
    private class BogusContext extends AbstractContext
    {
       @Override

hikaricp-java6/src/test/java/com/zaxxer/hikari/TestProxies.java

@@ -4,12 +4,14 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.concurrent.TimeUnit;
 
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.zaxxer.hikari.mocks.StubConnection;
 import com.zaxxer.hikari.mocks.StubStatement;
+import com.zaxxer.hikari.util.PoolUtilities;
 
 public class TestProxies
 {
@@ -88,4 +90,228 @@ public class TestProxies
          ds.close();
       }
    }
+
+   @Test
+   public void testStatementExceptions() throws SQLException
+   {
+      HikariConfig config = new HikariConfig();
+      config.setMinimumIdle(0);
+      config.setMaximumPoolSize(1);
+      config.setConnectionTimeout(TimeUnit.SECONDS.toMillis(1));
+      config.setConnectionTestQuery("VALUES 1");
+      config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
+
+      HikariDataSource ds = new HikariDataSource(config);
+      try {
+         Connection conn = ds.getConnection();
+         StubConnection stubConnection = conn.unwrap(StubConnection.class);
+         stubConnection.throwException = true;
+
+         try {
+            conn.createStatement();
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.createStatement(0, 0);
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.createStatement(0, 0, 0);
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.prepareCall("");
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.prepareCall("", 0, 0);
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.prepareCall("", 0, 0, 0);
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.prepareStatement("");
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.prepareStatement("", 0);
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.prepareStatement("", new int[0]);
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.prepareStatement("", new String[0]);
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.prepareStatement("", 0, 0);
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.prepareStatement("", 0, 0, 0);
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+      }
+      finally {
+         ds.close();
+      }
+   }
+
+   @Test
+   public void testOtherExceptions() throws SQLException
+   {
+      HikariConfig config = new HikariConfig();
+      config.setMinimumIdle(0);
+      config.setMaximumPoolSize(1);
+      config.setConnectionTestQuery("VALUES 1");
+      config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
+
+      HikariDataSource ds = new HikariDataSource(config);
+      try {
+         Connection conn = ds.getConnection();
+         StubConnection stubConnection = conn.unwrap(StubConnection.class);
+         stubConnection.throwException = true;
+
+         try {
+            conn.setTransactionIsolation(Connection.TRANSACTION_NONE);
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.isReadOnly();
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.setReadOnly(false);
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.setCatalog("");
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.setAutoCommit(false);
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.clearWarnings();
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.isValid(0);
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.isWrapperFor(getClass());
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.unwrap(getClass());
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.close();
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            Assert.assertFalse(conn.isValid(0));
+         }
+         catch (SQLException e) {
+            Assert.fail();
+         }
+}
+      finally {
+         ds.close();
+      }
+   }
 }

hikaricp-java6/src/test/java/com/zaxxer/hikari/TestValidation.java

@@ -267,6 +267,21 @@ public class TestValidation
       }
    }
 
+   @Test
+   public void validateInvalidLeakDetection()
+   {
+      try {
+         HikariConfig config = new HikariConfig();
+         config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
+         config.setLeakDetectionThreshold(1000L);
+         config.validate();
+         Assert.assertEquals(0, config.getLeakDetectionThreshold());
+      }
+      catch (IllegalArgumentException ise) {
+         // pass
+      }
+   }
+
    @Test
    public void validateZeroConnectionTimeout()
    {

hikaricp-java6/src/test/java/com/zaxxer/hikari/mocks/StubBaseConnection.java

@@ -7,10 +7,15 @@ import java.sql.Statement;
 
 public abstract class StubBaseConnection implements Connection
 {
+   public volatile boolean throwException;
+
    /** {@inheritDoc} */
    @Override
    public Statement createStatement() throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return new StubStatement(this);
    }
 
@@ -18,6 +23,9 @@ public abstract class StubBaseConnection implements Connection
    @Override
    public PreparedStatement prepareStatement(String sql) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return new StubPreparedStatement(this);
    }
 }

hikaricp-java6/src/test/java/com/zaxxer/hikari/mocks/StubConnection.java

@@ -53,16 +53,13 @@ public class StubConnection extends StubBaseConnection implements Connection
    private int isolation;
    private String catalog;
 
-    static
-    {
+   static {
       foo = System.currentTimeMillis();
    }
 
-    public StubConnection()
-    {
+   public StubConnection() {
       count.incrementAndGet();
-        if (slowCreate)
-        {
+      if (slowCreate) {
          PoolUtilities.quietlySleep(TimeUnit.SECONDS.toMillis(1));
       }
    }
@@ -72,6 +69,10 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public <T> T unwrap(Class<T> iface) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
+
       if (iface.isInstance(this)) {
          return (T) this;
       }
@@ -83,6 +84,9 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public boolean isWrapperFor(Class<?> iface) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return false;
    }
 
@@ -90,6 +94,9 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public CallableStatement prepareCall(String sql) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return null;
    }
 
@@ -104,6 +111,9 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public void setAutoCommit(boolean autoCommit) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       this.autoCommit = autoCommit;
    }
 
@@ -139,6 +149,9 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public boolean isClosed() throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return false;
    }
 
@@ -153,12 +166,18 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public void setReadOnly(boolean readOnly) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
    }
 
    /** {@inheritDoc} */
    @Override
    public boolean isReadOnly() throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return false;
    }
 
@@ -166,6 +185,9 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public void setCatalog(String catalog) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       this.catalog = catalog;
    }
 
@@ -180,6 +202,9 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public void setTransactionIsolation(int level) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       this.isolation = level;
    }
 
@@ -201,12 +226,18 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public void clearWarnings() throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
    }
 
    /** {@inheritDoc} */
    @Override
    public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return null;
    }
 
@@ -214,6 +245,9 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return new StubPreparedStatement(this);
    }
 
@@ -221,6 +255,9 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return null;
    }
 
@@ -280,6 +317,9 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return null;
    }
 
@@ -287,6 +327,9 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return new StubPreparedStatement(this);
    }
 
@@ -294,6 +337,9 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return null;
    }
 
@@ -301,6 +347,9 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return new StubPreparedStatement(this);
    }
 
@@ -308,6 +357,9 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return new StubPreparedStatement(this);
    }
 
@@ -315,6 +367,9 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return new StubPreparedStatement(this);
    }
 
@@ -350,6 +405,9 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public boolean isValid(int timeout) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return true;
    }
 

hikaricp/src/test/java/com/zaxxer/hikari/MiscTest.java

@@ -25,14 +25,9 @@ import java.util.concurrent.TimeUnit;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.slf4j.impl.SimpleLogger;
 import org.slf4j.spi.LocationAwareLogger;
 
 import com.zaxxer.hikari.pool.HikariPool;
-import com.zaxxer.hikari.pool.PoolBagEntry;
-import com.zaxxer.hikari.util.ConcurrentBag;
 import com.zaxxer.hikari.util.LeakTask;
 import com.zaxxer.hikari.util.PoolUtilities;
 
@@ -49,7 +44,7 @@ public class MiscTest
       config.setMaximumPoolSize(4);
       config.setPoolName("test");
       config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
-      TestElf.setConfigUnitTest();
+      TestElf.setConfigUnitTest(true);
 
       final HikariDataSource ds = new HikariDataSource(config);
       try {
@@ -60,6 +55,7 @@ public class MiscTest
       }
       finally
       {
+         TestElf.setConfigUnitTest(false);
          ds.close();
       }
    }
@@ -88,70 +84,6 @@ public class MiscTest
       }
    }
 
-   @Test
-   public void testConcurrentBag() throws InterruptedException
-   {
-      ConcurrentBag<PoolBagEntry> bag = new ConcurrentBag<PoolBagEntry>(null);
-      Assert.assertEquals(0, bag.values(8).size());
-
-      PoolBagEntry reserved = new PoolBagEntry(null, 0);
-      bag.add(reserved);
-      bag.reserve(reserved);      // reserved
-
-      PoolBagEntry inuse = new PoolBagEntry(null, 0);
-      bag.add(inuse);
-      bag.borrow(2L, TimeUnit.SECONDS); // in use
-      
-      PoolBagEntry notinuse = new PoolBagEntry(null, 0);
-      bag.add(notinuse); // not in use
-      
-      bag.dumpState();
-
-      try {
-         bag.requite(reserved);
-         Assert.fail();
-      }
-      catch (IllegalStateException e) {
-         // pass
-      }
-
-      try {
-         bag.remove(notinuse);
-         Assert.fail();
-      }
-      catch (IllegalStateException e) {
-         // pass
-      }
-
-      try {
-         bag.unreserve(notinuse);
-         Assert.fail();
-      }
-      catch (IllegalStateException e) {
-         // pass
-      }
-
-      try {
-         bag.remove(inuse);
-         bag.remove(inuse);
-         Assert.fail();
-      }
-      catch (IllegalStateException e) {
-         // pass
-      }
-
-      bag.close();
-      try {
-         bag.add(new PoolBagEntry(null, 0));
-         Assert.fail();
-      }
-      catch (IllegalStateException e) {
-         // pass
-      }
-
-      Assert.assertNotNull(notinuse.toString());
-   }
-
    @Test
    public void testLeakDetection() throws SQLException
    {
@@ -165,7 +97,7 @@ public class MiscTest
       config.setPoolName("test");
       config.setLeakDetectionThreshold(TimeUnit.SECONDS.toMillis(1));
       config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
-      TestElf.setConfigUnitTest();
+      TestElf.setConfigUnitTest(true);
 
       final HikariDataSource ds = new HikariDataSource(config);
       try {
@@ -183,6 +115,7 @@ public class MiscTest
       }
       finally
       {
+         TestElf.setConfigUnitTest(false);
          ds.close();
       }
    }

hikaricp/src/test/java/com/zaxxer/hikari/TestConcurrentBag.java

@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2013 Brett Wooldridge
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.zaxxer.hikari;
+
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.zaxxer.hikari.pool.PoolBagEntry;
+import com.zaxxer.hikari.util.ConcurrentBag;
+
+/**
+ *
+ * @author Brett Wooldridge
+ */
+public class TestConcurrentBag
+{
+   @Test
+   public void testConcurrentBag() throws InterruptedException
+   {
+      ConcurrentBag<PoolBagEntry> bag = new ConcurrentBag<PoolBagEntry>(null);
+      Assert.assertEquals(0, bag.values(8).size());
+
+      PoolBagEntry reserved = new PoolBagEntry(null, 0);
+      bag.add(reserved);
+      bag.reserve(reserved);      // reserved
+
+      PoolBagEntry inuse = new PoolBagEntry(null, 0);
+      bag.add(inuse);
+      bag.borrow(2L, TimeUnit.SECONDS); // in use
+      
+      PoolBagEntry notinuse = new PoolBagEntry(null, 0);
+      bag.add(notinuse); // not in use
+      
+      bag.dumpState();
+
+      try {
+         bag.requite(reserved);
+         Assert.fail();
+      }
+      catch (IllegalStateException e) {
+         // pass
+      }
+
+      try {
+         bag.remove(notinuse);
+         Assert.fail();
+      }
+      catch (IllegalStateException e) {
+         // pass
+      }
+
+      try {
+         bag.unreserve(notinuse);
+         Assert.fail();
+      }
+      catch (IllegalStateException e) {
+         // pass
+      }
+
+      try {
+         bag.remove(inuse);
+         bag.remove(inuse);
+         Assert.fail();
+      }
+      catch (IllegalStateException e) {
+         // pass
+      }
+
+      bag.close();
+      try {
+         bag.add(new PoolBagEntry(null, 0));
+         Assert.fail();
+      }
+      catch (IllegalStateException e) {
+         // pass
+      }
+
+      Assert.assertNotNull(notinuse.toString());
+   }
+}

hikaricp/src/test/java/com/zaxxer/hikari/TestElf.java

@@ -61,12 +61,12 @@ public final class TestElf
       }
    }
 
-   public static void setConfigUnitTest()
+   public static void setConfigUnitTest(boolean unitTest)
    {
       try {
          Field field = HikariConfig.class.getDeclaredField("unitTest");
          field.setAccessible(true);
-         field.setBoolean(null, true);
+         field.setBoolean(null, unitTest);
       }
       catch (Exception e) {
          throw new RuntimeException(e);

hikaricp/src/test/java/com/zaxxer/hikari/TestJNDI.java

@@ -68,6 +68,22 @@ public class TestJNDI
       Assert.assertEquals("foo", ds.getUsername());
    }
 
+   @Test
+   public void testJndiLookup3() throws Exception
+   {
+      HikariJNDIFactory jndi = new HikariJNDIFactory();
+
+      Reference ref = new Reference("javax.sql.DataSource");
+      ref.add(new BogusRef("dataSourceJNDI", "java:comp/env/HikariDS"));
+      try {
+         jndi.getObjectInstance(ref, null, null, null);
+         Assert.fail();
+      }
+      catch (RuntimeException e) {
+         Assert.assertTrue(e.getMessage().contains("JNDI context is null"));
+      }
+   }
+
    private class BogusContext extends AbstractContext
    {
       @Override

hikaricp/src/test/java/com/zaxxer/hikari/TestProxies.java

@@ -4,12 +4,14 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.concurrent.TimeUnit;
 
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.zaxxer.hikari.mocks.StubConnection;
 import com.zaxxer.hikari.mocks.StubStatement;
+import com.zaxxer.hikari.util.PoolUtilities;
 
 public class TestProxies
 {
@@ -88,4 +90,228 @@ public class TestProxies
          ds.close();
       }
    }
+
+   @Test
+   public void testStatementExceptions() throws SQLException
+   {
+      HikariConfig config = new HikariConfig();
+      config.setMinimumIdle(0);
+      config.setMaximumPoolSize(1);
+      config.setConnectionTimeout(TimeUnit.SECONDS.toMillis(1));
+      config.setConnectionTestQuery("VALUES 1");
+      config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
+
+      HikariDataSource ds = new HikariDataSource(config);
+      try {
+         Connection conn = ds.getConnection();
+         StubConnection stubConnection = conn.unwrap(StubConnection.class);
+         stubConnection.throwException = true;
+
+         try {
+            conn.createStatement();
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.createStatement(0, 0);
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.createStatement(0, 0, 0);
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.prepareCall("");
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.prepareCall("", 0, 0);
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.prepareCall("", 0, 0, 0);
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.prepareStatement("");
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.prepareStatement("", 0);
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.prepareStatement("", new int[0]);
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.prepareStatement("", new String[0]);
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.prepareStatement("", 0, 0);
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.prepareStatement("", 0, 0, 0);
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+      }
+      finally {
+         ds.close();
+      }
+   }
+
+   @Test
+   public void testOtherExceptions() throws SQLException
+   {
+      HikariConfig config = new HikariConfig();
+      config.setMinimumIdle(0);
+      config.setMaximumPoolSize(1);
+      config.setConnectionTestQuery("VALUES 1");
+      config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
+
+      HikariDataSource ds = new HikariDataSource(config);
+      try {
+         Connection conn = ds.getConnection();
+         StubConnection stubConnection = conn.unwrap(StubConnection.class);
+         stubConnection.throwException = true;
+
+         try {
+            conn.setTransactionIsolation(Connection.TRANSACTION_NONE);
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.isReadOnly();
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.setReadOnly(false);
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.setCatalog("");
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.setAutoCommit(false);
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.clearWarnings();
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.isValid(0);
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.isWrapperFor(getClass());
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.unwrap(getClass());
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            conn.close();
+            Assert.fail();
+         }
+         catch (SQLException e) {
+            // pass
+         }
+
+         try {
+            Assert.assertFalse(conn.isValid(0));
+         }
+         catch (SQLException e) {
+            Assert.fail();
+         }
+}
+      finally {
+         ds.close();
+      }
+   }
 }

hikaricp/src/test/java/com/zaxxer/hikari/TestValidation.java

@@ -267,6 +267,21 @@ public class TestValidation
       }
    }
 
+   @Test
+   public void validateInvalidLeakDetection()
+   {
+      try {
+         HikariConfig config = new HikariConfig();
+         config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
+         config.setLeakDetectionThreshold(1000L);
+         config.validate();
+         Assert.assertEquals(0, config.getLeakDetectionThreshold());
+      }
+      catch (IllegalArgumentException ise) {
+         // pass
+      }
+   }
+
    @Test
    public void validateZeroConnectionTimeout()
    {

hikaricp/src/test/java/com/zaxxer/hikari/mocks/StubBaseConnection.java

@@ -7,10 +7,15 @@ import java.sql.Statement;
 
 public abstract class StubBaseConnection implements Connection
 {
+   public volatile boolean throwException;
+
    /** {@inheritDoc} */
    @Override
    public Statement createStatement() throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return new StubStatement(this);
    }
 
@@ -18,6 +23,9 @@ public abstract class StubBaseConnection implements Connection
    @Override
    public PreparedStatement prepareStatement(String sql) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return new StubPreparedStatement(this);
    }
 }

hikaricp/src/test/java/com/zaxxer/hikari/mocks/StubConnection.java

@@ -53,16 +53,13 @@ public class StubConnection extends StubBaseConnection implements Connection
    private int isolation;
    private String catalog;
 
-    static
-    {
+   static {
       foo = System.currentTimeMillis();
    }
 
-    public StubConnection()
-    {
+   public StubConnection() {
       count.incrementAndGet();
-        if (slowCreate)
-        {
+      if (slowCreate) {
          PoolUtilities.quietlySleep(TimeUnit.SECONDS.toMillis(1));
       }
    }
@@ -72,6 +69,10 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public <T> T unwrap(Class<T> iface) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
+
       if (iface.isInstance(this)) {
          return (T) this;
       }
@@ -83,6 +84,9 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public boolean isWrapperFor(Class<?> iface) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return false;
    }
 
@@ -90,6 +94,9 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public CallableStatement prepareCall(String sql) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return null;
    }
 
@@ -104,6 +111,9 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public void setAutoCommit(boolean autoCommit) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       this.autoCommit = autoCommit;
    }
 
@@ -139,6 +149,9 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public boolean isClosed() throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return false;
    }
 
@@ -153,12 +166,18 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public void setReadOnly(boolean readOnly) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
    }
 
    /** {@inheritDoc} */
    @Override
    public boolean isReadOnly() throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return false;
    }
 
@@ -166,6 +185,9 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public void setCatalog(String catalog) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       this.catalog = catalog;
    }
 
@@ -180,6 +202,9 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public void setTransactionIsolation(int level) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       this.isolation = level;
    }
 
@@ -201,12 +226,18 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public void clearWarnings() throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
    }
 
    /** {@inheritDoc} */
    @Override
    public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return null;
    }
 
@@ -214,6 +245,9 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return new StubPreparedStatement(this);
    }
 
@@ -221,6 +255,9 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return null;
    }
 
@@ -280,6 +317,9 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return null;
    }
 
@@ -287,6 +327,9 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return new StubPreparedStatement(this);
    }
 
@@ -294,6 +337,9 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return null;
    }
 
@@ -301,6 +347,9 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return new StubPreparedStatement(this);
    }
 
@@ -308,6 +357,9 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return new StubPreparedStatement(this);
    }
 
@@ -315,6 +367,9 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return new StubPreparedStatement(this);
    }
 
@@ -350,6 +405,9 @@ public class StubConnection extends StubBaseConnection implements Connection
    @Override
    public boolean isValid(int timeout) throws SQLException
    {
+      if (throwException) {
+         throw new SQLException();
+      }
       return true;
    }