Fix some broken tests

Author: uglide

src/test/java/redis/clients/jedis/ACLJedisPoolTest.java

@@ -5,6 +5,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import java.net.URI;
 import java.net.URISyntaxException;
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 import org.junit.BeforeClass;
@@ -22,6 +23,8 @@
 public class ACLJedisPoolTest {
   private static final EndpointConfig endpoint = HostAndPorts.getRedisEndpoint("standalone0-acl");
 
+  private static final EndpointConfig endpointWithDefaultUser = HostAndPorts.getRedisEndpoint("standalone0");
+
   @BeforeClass
   public static void prepare() throws Exception {
     // Use to check if the ACL test should be ran. ACL are available only in 6.0 and later
@@ -194,15 +197,15 @@ public void startWithUrl() throws URISyntaxException {
     }
 
     try (JedisPool pool = new JedisPool(
-        endpoint.getCustomizedURI("default", endpoint.getPassword(), "/2"));
+        endpointWithDefaultUser.getCustomizedURI(true, "/2"));
         Jedis jedis = pool.getResource()) {
       assertEquals("bar", jedis.get("foo"));
     }
   }
 
   @Test(expected = InvalidURIException.class)
   public void shouldThrowInvalidURIExceptionForInvalidURI() throws URISyntaxException {
-    new JedisPool(endpoint.getURI()).close();
+    new JedisPool(new URI("localhost:6379")).close();
   }
 
   @Test
@@ -256,8 +259,9 @@ public void testCloseConnectionOnMakeObject() {
     JedisPoolConfig config = new JedisPoolConfig();
     config.setTestOnBorrow(true);
     try (JedisPool pool = new JedisPool(new JedisPoolConfig(), endpoint.getHost(), endpoint.getPort(), 2000,
-        endpoint.getUsername(), endpoint.getPassword()); Jedis jedis = new Jedis(endpoint.getCustomizedURI(
-        "", endpoint.getPassword(), ""))) {
+            endpoint.getUsername(), "wrongpassword");
+         Jedis jedis = new Jedis(endpointWithDefaultUser.getCustomizedURI(
+                 "", endpointWithDefaultUser.getPassword(), ""))) {
       int currentClientCount = getClientCount(jedis.clientList());
       try {
         pool.getResource();

src/test/java/redis/clients/jedis/HostAndPorts.java

@@ -43,6 +43,10 @@ public final class HostAndPorts {
   }
 
   public static EndpointConfig getRedisEndpoint(String endpointName) {
+    if (!endpointConfigs.containsKey(endpointName)) {
+      throw new IllegalArgumentException("Unknown Redis endpoint: " + endpointName);
+    }
+
     return endpointConfigs.get(endpointName);
   }
 

src/test/java/redis/clients/jedis/PipeliningTest.java

@@ -323,7 +323,7 @@ public void waitReplicas() {
     p.waitReplicas(1, 10);
     p.sync();
 
-    EndpointConfig endpoint = HostAndPorts.getRedisEndpoint("standalone4");
+    EndpointConfig endpoint = HostAndPorts.getRedisEndpoint("standalone4-replica-of-standalone1");
 
     try (Jedis j = new Jedis(endpoint.getHostAndPort())) {
       j.auth(endpoint.getPassword());
@@ -338,7 +338,7 @@ public void waitAof() {
     p.waitAOF(1L, 0L, 0L);
     p.sync();
 
-    EndpointConfig endpoint = HostAndPorts.getRedisEndpoint("standalone4");
+    EndpointConfig endpoint = HostAndPorts.getRedisEndpoint("standalone4-replica-of-standalone1");
 
     try (Jedis j = new Jedis(endpoint.getHostAndPort())) {
       j.auth(endpoint.getPassword());

src/test/java/redis/clients/jedis/commands/jedis/ControlCommandsTest.java

@@ -143,7 +143,7 @@ public void roleMaster() {
   public void roleSlave() {
     EndpointConfig primaryEndpoint = HostAndPorts.getRedisEndpoint("standalone0");
 
-    try (Jedis slave = HostAndPorts.getRedisEndpoint("standalone4").getJedis()) {
+    try (Jedis slave = HostAndPorts.getRedisEndpoint("standalone4-replica-of-standalone1").getJedis()) {
 
       List<Object> role = slave.role();
       assertEquals("slave", role.get(0));

src/test/java/redis/clients/jedis/commands/jedis/FailoverCommandsTest.java

@@ -18,7 +18,7 @@ public class FailoverCommandsTest {
   private static final int INVALID_PORT = 6000;
 
   private static final EndpointConfig node1 = HostAndPorts.getRedisEndpoint("standalone9");
-  private static final EndpointConfig node2 = HostAndPorts.getRedisEndpoint("standalone10");
+  private static final EndpointConfig node2 = HostAndPorts.getRedisEndpoint("standalone10-replica-of-standalone9");
 
   private HostAndPort masterAddress;
   private HostAndPort replicaAddress;