Remove acquireIncrement from tests.

src/test/java/com/zaxxer/hikari/ConnectionStateTest.java

@@ -15,7 +15,6 @@ public class ConnectionStateTest
         ds.setAutoCommit(true);
         ds.setMinimumPoolSize(1);
         ds.setMaximumPoolSize(1);
-        ds.setAcquireIncrement(1);
         ds.setConnectionTestQuery("VALUES 1");
         ds.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
 
@@ -43,7 +42,6 @@ public class ConnectionStateTest
         ds.setTransactionIsolation("TRANSACTION_READ_COMMITTED");
         ds.setMinimumPoolSize(1);
         ds.setMaximumPoolSize(1);
-        ds.setAcquireIncrement(1);
         ds.setConnectionTestQuery("VALUES 1");
         ds.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
 
@@ -71,7 +69,6 @@ public class ConnectionStateTest
         ds.setCatalog("test");
         ds.setMinimumPoolSize(1);
         ds.setMaximumPoolSize(1);
-        ds.setAcquireIncrement(1);
         ds.setConnectionTestQuery("VALUES 1");
         ds.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
 

src/test/java/com/zaxxer/hikari/CreationTest.java

@@ -40,7 +40,6 @@ public class CreationTest
         HikariConfig config = new HikariConfig();
         config.setMinimumPoolSize(1);
         config.setMaximumPoolSize(1);
-        config.setAcquireIncrement(1);
         config.setConnectionTestQuery("VALUES 1");
         config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
 
@@ -136,7 +135,6 @@ public class CreationTest
         HikariConfig config = new HikariConfig();
         config.setMinimumPoolSize(1);
         config.setMaximumPoolSize(1);
-        config.setAcquireIncrement(1);
         config.setConnectionTestQuery("VALUES 1");
         config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
 

src/test/java/com/zaxxer/hikari/ExceptionTest.java

@@ -20,7 +20,6 @@ public class ExceptionTest
         HikariConfig config = new HikariConfig();
         config.setMinimumPoolSize(1);
         config.setMaximumPoolSize(2);
-        config.setAcquireIncrement(1);
         config.setConnectionTestQuery("VALUES 1");
         config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
 
@@ -93,7 +92,6 @@ public class ExceptionTest
         HikariConfig config = new HikariConfig();
         config.setMinimumPoolSize(1);
         config.setMaximumPoolSize(2);
-        config.setAcquireIncrement(1);
         config.setConnectionTestQuery("VALUES 1");
         config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
 

src/test/java/com/zaxxer/hikari/FailedRetryTest.java

@@ -0,0 +1,85 @@
+package com.zaxxer.hikari;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.zaxxer.hikari.mocks.StubDataSource;
+
+public class FailedRetryTest
+{
+    @Test
+    public void testConnectionRetries() throws SQLException
+    {
+        HikariConfig config = new HikariConfig();
+        config.setMinimumPoolSize(0);
+        config.setMaximumPoolSize(1);
+        config.setConnectionTimeout(2800);
+        config.setConnectionTestQuery("VALUES 1");
+        config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
+
+        HikariDataSource ds = new HikariDataSource(config);
+
+        StubDataSource stubDataSource = ds.unwrap(StubDataSource.class);
+        stubDataSource.setThrowException(new SQLException("Connection refused"));
+
+        long start = System.currentTimeMillis();
+        try
+        {
+            Connection connection = ds.getConnection();
+            connection.close();
+            Assert.fail("Should not have been able to get a connection.");
+        }
+        catch (SQLException e)
+        {
+            long elapsed = System.currentTimeMillis() - start;
+            System.err.printf("Elapsed time for connection attempt %dms\n", elapsed);
+            Assert.assertTrue("Didn't wait long enough for timeout", (elapsed > config.getConnectionTimeout()));
+        }
+    }
+
+    @Test
+    public void testConnectionRetries2() throws SQLException
+    {
+        HikariConfig config = new HikariConfig();
+        config.setMinimumPoolSize(0);
+        config.setMaximumPoolSize(1);
+        config.setConnectionTimeout(2800);
+        config.setConnectionTestQuery("VALUES 1");
+        config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
+
+        HikariDataSource ds = new HikariDataSource(config);
+
+        final long timePerTry = config.getConnectionTimeout() / (config.getAcquireRetries() + 1);
+
+        final StubDataSource stubDataSource = ds.unwrap(StubDataSource.class);
+        stubDataSource.setThrowException(new SQLException("Connection refused"));
+
+        Executors.newScheduledThreadPool(1).schedule(new Runnable() {
+            public void run()
+            {
+                stubDataSource.setThrowException(null);
+                System.err.println("Turned off exception throwing.");
+            }
+        }, (timePerTry * 2) + 100, TimeUnit.MILLISECONDS);
+
+        long start = System.currentTimeMillis();
+        try
+        {
+            Connection connection = ds.getConnection();
+            System.err.println("Got a connection!");
+            // connection.close();
+            Assert.fail("Should not have been able to get a connection.");
+        }
+        catch (SQLException e)
+        {
+            long elapsed = System.currentTimeMillis() - start;
+            System.err.printf("Elapsed time for connection attempt %dms\n", elapsed);
+            Assert.assertTrue("Didn't wait long enough for timeout", (elapsed > timePerTry * 3) && (elapsed < timePerTry * 4));
+        }
+    }
+}

src/test/java/com/zaxxer/hikari/JdbcDriverTest.java

@@ -28,7 +28,6 @@ public class JdbcDriverTest
         HikariConfig config = new HikariConfig();
         config.setMinimumPoolSize(1);
         config.setMaximumPoolSize(1);
-        config.setAcquireIncrement(1);
         config.setConnectionTestQuery("VALUES 1");
         config.setDriverClassName("com.zaxxer.hikari.mocks.StubDriver");
         config.setJdbcUrl("jdbc:stub");

src/test/java/com/zaxxer/hikari/RampUpDown.java

@@ -14,7 +14,6 @@ public class RampUpDown
         HikariConfig config = new HikariConfig();
         config.setMinimumPoolSize(5);
         config.setMaximumPoolSize(60);
-        config.setAcquireIncrement(1);
         config.setConnectionTestQuery("VALUES 1");
         config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
 

src/test/java/com/zaxxer/hikari/StatementTest.java

@@ -15,7 +15,6 @@ public class StatementTest
         HikariConfig config = new HikariConfig();
         config.setMinimumPoolSize(1);
         config.setMaximumPoolSize(2);
-        config.setAcquireIncrement(1);
         config.setConnectionTestQuery("VALUES 1");
         config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
 
@@ -44,7 +43,6 @@ public class StatementTest
         HikariConfig config = new HikariConfig();
         config.setMinimumPoolSize(1);
         config.setMaximumPoolSize(2);
-        config.setAcquireIncrement(1);
         config.setConnectionTestQuery("VALUES 1");
         config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
 
@@ -69,7 +67,6 @@ public class StatementTest
         HikariConfig config = new HikariConfig();
         config.setMinimumPoolSize(1);
         config.setMaximumPoolSize(2);
-        config.setAcquireIncrement(1);
         config.setConnectionTestQuery("VALUES 1");
         config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
 
@@ -90,7 +87,6 @@ public class StatementTest
         HikariConfig config = new HikariConfig();
         config.setMinimumPoolSize(1);
         config.setMaximumPoolSize(2);
-        config.setAcquireIncrement(1);
         config.setConnectionTestQuery("VALUES 1");
         config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
 

src/test/java/com/zaxxer/hikari/UnwrapTest.java

@@ -36,7 +36,6 @@ public class UnwrapTest
         HikariConfig config = new HikariConfig();
         config.setMinimumPoolSize(1);
         config.setMaximumPoolSize(1);
-        config.setAcquireIncrement(1);
         config.setConnectionTestQuery("VALUES 1");
         config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
 

src/test/java/com/zaxxer/hikari/mocks/StubDataSource.java

@@ -33,6 +33,7 @@ public class StubDataSource implements DataSource
     private String user;
     private String password;
     private PrintWriter logWriter;
+    private SQLException throwException;
 
     public String getUser()
     {
@@ -105,6 +106,11 @@ public class StubDataSource implements DataSource
     @Override
     public Connection getConnection() throws SQLException
     {
+        if (throwException != null)
+        {
+            throw throwException;
+        }
+
         return new StubConnection();
     }
 
@@ -114,4 +120,9 @@ public class StubDataSource implements DataSource
     {
         return new StubConnection();
     }
+
+    public void setThrowException(SQLException e)
+    {
+        this.throwException = e;
+    }
 }