Update ACL tests and modify JedisPool tests

Makefile

@@ -6,6 +6,7 @@ daemonize yes
 protected-mode no
 port 6379
 requirepass foobared
+user acljedis on allcommands allkeys >fizzbuzz
 pidfile /tmp/redis1.pid
 logfile /tmp/redis1.log
 save ""

src/main/java/redis/clients/jedis/JedisPool.java

@@ -76,6 +76,15 @@ public JedisPool(final GenericObjectPoolConfig poolConfig, final String host, in
     this(poolConfig, host, port, timeout, password, Protocol.DEFAULT_DATABASE);
   }
 
+  public JedisPool(final String host, int port, String user, final String password) {
+    this(new GenericObjectPoolConfig(), host, port, user, password);
+  }
+
+  public JedisPool(final GenericObjectPoolConfig poolConfig, final String host, int port,
+      String user, final String password) {
+    this(poolConfig, host, port, Protocol.DEFAULT_TIMEOUT, user, password, Protocol.DEFAULT_DATABASE);
+  }
+
   public JedisPool(final GenericObjectPoolConfig poolConfig, final String host, int port,
       int timeout, final String user, final String password) {
     this(poolConfig, host, port, timeout, user, password, Protocol.DEFAULT_DATABASE);

src/test/java/redis/clients/jedis/tests/JedisPoolTest.java

@@ -8,7 +8,6 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.concurrent.atomic.AtomicInteger;
-
 import org.apache.commons.pool2.PooledObject;
 import org.apache.commons.pool2.PooledObjectFactory;
 import org.apache.commons.pool2.impl.DefaultPooledObject;
@@ -21,7 +20,6 @@
 import redis.clients.jedis.JedisPoolConfig;
 import redis.clients.jedis.Transaction;
 import redis.clients.jedis.exceptions.InvalidURIException;
-import redis.clients.jedis.exceptions.JedisException;
 import redis.clients.jedis.exceptions.JedisExhaustedPoolException;
 
 public class JedisPoolTest {
@@ -42,56 +40,64 @@ public void checkConnections() {
   @Test
   public void checkCloseableConnections() throws Exception {
     JedisPool pool = new JedisPool(new JedisPoolConfig(), hnp.getHost(), hnp.getPort(), 2000);
-    Jedis jedis = pool.getResource();
-    jedis.auth("foobared");
-    jedis.set("foo", "bar");
-    assertEquals("bar", jedis.get("foo"));
-    jedis.close();
+    try (Jedis jedis = pool.getResource()) {
+      jedis.auth("foobared");
+      jedis.set("foo", "bar");
+      assertEquals("bar", jedis.get("foo"));
+    }
     pool.close();
     assertTrue(pool.isClosed());
   }
 
   @Test
   public void checkConnectionWithDefaultPort() {
-    JedisPool pool = new JedisPool(new JedisPoolConfig(), hnp.getHost(), hnp.getPort());
-    Jedis jedis = pool.getResource();
-    jedis.auth("foobared");
-    jedis.set("foo", "bar");
-    assertEquals("bar", jedis.get("foo"));
-    jedis.close();
+    JedisPool pool = new JedisPool(new JedisPoolConfig(), hnp.getHost());
+    try (Jedis jedis = pool.getResource()) {
+      jedis.auth("foobared");
+      jedis.set("foo", "bar");
+      assertEquals("bar", jedis.get("foo"));
+    }
     pool.destroy();
     assertTrue(pool.isClosed());
   }
 
   @Test
-  public void checkJedisIsReusedWhenReturned() {
+  public void checkResourceIsClosableAndReusable() {
+    GenericObjectPoolConfig config = new GenericObjectPoolConfig();
+    config.setMaxTotal(1);
+    config.setBlockWhenExhausted(false);
+    JedisPool pool = new JedisPool(config, hnp.getHost(), hnp.getPort(), 2000, "foobared", 0,
+        "closable-resuable-pool", false, null, null, null);
 
-    JedisPool pool = new JedisPool(new JedisPoolConfig(), hnp.getHost(), hnp.getPort());
     Jedis jedis = pool.getResource();
-    jedis.auth("foobared");
-    jedis.set("foo", "0");
-    jedis.close();
+    try {
+      jedis.set("hello", "jedis");
+    } finally {
+      jedis.close();
+    }
 
-    jedis = pool.getResource();
-    jedis.auth("foobared");
-    jedis.incr("foo");
-    jedis.close();
-    pool.destroy();
-    assertTrue(pool.isClosed());
+    Jedis jedis2 = pool.getResource();
+    try {
+      assertEquals(jedis, jedis2);
+      assertEquals("jedis", jedis2.get("hello"));
+    } finally {
+      jedis2.close();
+    }
   }
 
   @Test
   public void checkPoolRepairedWhenJedisIsBroken() {
     JedisPool pool = new JedisPool(new JedisPoolConfig(), hnp.getHost(), hnp.getPort());
-    Jedis jedis = pool.getResource();
-    jedis.auth("foobared");
-    jedis.quit();
-    jedis.close();
+    try (Jedis jedis = pool.getResource()) {
+      jedis.auth("foobared");
+      jedis.set("foo", "0");
+      jedis.quit();
+    }
 
-    jedis = pool.getResource();
-    jedis.auth("foobared");
-    jedis.incr("foo");
-    jedis.close();
+    try (Jedis jedis = pool.getResource()) {
+      jedis.auth("foobared");
+      jedis.incr("foo");
+    }
     pool.destroy();
     assertTrue(pool.isClosed());
   }
@@ -299,28 +305,6 @@ public void returnResourceShouldResetState() {
     assertTrue(pool.isClosed());
   }
 
-  @Test
-  public void checkResourceIsCloseable() {
-    GenericObjectPoolConfig config = new GenericObjectPoolConfig();
-    config.setMaxTotal(1);
-    config.setBlockWhenExhausted(false);
-    JedisPool pool = new JedisPool(config, hnp.getHost(), hnp.getPort(), 2000, "foobared");
-
-    Jedis jedis = pool.getResource();
-    try {
-      jedis.set("hello", "jedis");
-    } finally {
-      jedis.close();
-    }
-
-    Jedis jedis2 = pool.getResource();
-    try {
-      assertEquals(jedis, jedis2);
-    } finally {
-      jedis2.close();
-    }
-  }
-
   @Test
   public void getNumActiveIsNegativeWhenPoolIsClosed() {
     JedisPool pool = new JedisPool(new JedisPoolConfig(), hnp.getHost(), hnp.getPort(), 2000,