Fix ClusterCommandExecutorTest

Author: uglide

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

@@ -367,6 +367,14 @@ protected void sleep(long sleepMillis) {
   @Test
   public void runSuccessfulExecuteKeylessCommand() {
     ClusterConnectionProvider connectionHandler = mock(ClusterConnectionProvider.class);
+    Map<String, ConnectionPool> connectionMap = new HashMap<>();
+    ConnectionPool pool = mock(ConnectionPool.class);
+    Connection connection = mock(Connection.class);
+
+    connectionMap.put("localhost:6379", pool);
+    when(connectionHandler.getConnectionMap()).thenReturn(connectionMap);
+    when(pool.getResource()).thenReturn(connection);
+
     ClusterCommandExecutor testMe = new ClusterCommandExecutor(connectionHandler, 10, Duration.ZERO) {
       @Override
       public <T> T execute(Connection connection, CommandObject<T> commandObject) {
@@ -417,12 +425,13 @@ public void runKeylessCommandIgnoresRedirections() {
     ClusterConnectionProvider connectionHandler = mock(ClusterConnectionProvider.class);
     Map<String, ConnectionPool> connectionMap = new HashMap<>();
     ConnectionPool pool = mock(ConnectionPool.class);
-    Connection connection = mock(Connection.class);
+    Connection connection1 = mock(Connection.class);
+    Connection connection2 = mock(Connection.class);
     final HostAndPort movedTarget = new HostAndPort(null, 0);
 
     connectionMap.put("localhost:6379", pool);
     when(connectionHandler.getConnectionMap()).thenReturn(connectionMap);
-    when(pool.getResource()).thenReturn(connection);
+    when(pool.getResource()).thenReturn(connection1, connection2);
 
     ClusterCommandExecutor testMe = new ClusterCommandExecutor(connectionHandler, 10, ONE_SECOND) {
       boolean isFirstCall = true;
@@ -447,24 +456,25 @@ protected void sleep(long ignored) {
 
     // Verify that we called getConnectionMap() twice (first failed with redirection, second succeeded)
     // and that we didn't follow the redirection to a specific node
-    InOrder inOrder = inOrder(connectionHandler, pool, connection);
-    inOrder.verify(connectionHandler, times(2)).getConnectionMap();
-    inOrder.verify(pool, times(2)).getResource();
-    inOrder.verify(connection, times(2)).close();
-    inOrder.verifyNoMoreInteractions();
+    verify(connectionHandler, times(2)).getConnectionMap();
+    verify(pool, times(2)).getResource();
+    verify(connection1).close();
+    verify(connection2).close();
   }
 
   @Test
   public void runKeylessCommandFailsAfterMaxAttempts() {
     ClusterConnectionProvider connectionHandler = mock(ClusterConnectionProvider.class);
     Map<String, ConnectionPool> connectionMap = new HashMap<>();
     ConnectionPool pool = mock(ConnectionPool.class);
-    Connection connection = mock(Connection.class);
+    Connection connection1 = mock(Connection.class);
+    Connection connection2 = mock(Connection.class);
+    Connection connection3 = mock(Connection.class);
     final LongConsumer sleep = mock(LongConsumer.class);
 
     connectionMap.put("localhost:6379", pool);
     when(connectionHandler.getConnectionMap()).thenReturn(connectionMap);
-    when(pool.getResource()).thenReturn(connection);
+    when(pool.getResource()).thenReturn(connection1, connection2, connection3);
 
     ClusterCommandExecutor testMe = new ClusterCommandExecutor(connectionHandler, 3, ONE_SECOND) {
       @Override
@@ -486,16 +496,15 @@ protected void sleep(long sleepMillis) {
     }
 
     // Verify that we tried connection map access and performed slot cache renewal
-    InOrder inOrder = inOrder(connectionHandler, pool, connection, sleep);
-    inOrder.verify(connectionHandler, times(2)).getConnectionMap();
-    inOrder.verify(pool, times(2)).getResource();
-    inOrder.verify(connection, times(2)).close();
-    inOrder.verify(sleep).accept(ArgumentMatchers.anyLong());
-    inOrder.verify(connectionHandler).renewSlotCache();
-    inOrder.verify(connectionHandler).getConnectionMap();
-    inOrder.verify(pool).getResource();
-    inOrder.verify(connection).close();
-    inOrder.verifyNoMoreInteractions();
+    // getConnectionMap() called 3 times (once for each connection attempt)
+    // getResource() called 3 times, sleep called once, renewSlotCache called once
+    verify(connectionHandler, times(3)).getConnectionMap();
+    verify(pool, times(3)).getResource();
+    verify(connection1).close();
+    verify(connection2).close();
+    verify(connection3).close();
+    verify(sleep).accept(ArgumentMatchers.anyLong());
+    verify(connectionHandler).renewSlotCache();
   }
 
   @Test