Polishing.

Remove static mocking to test actual behavior. Adapt tests.

See #3346
Original pull request: #3347

Author: mp911de

src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java

@@ -594,9 +594,7 @@ public void openPipeline() {
 		try {
 
 			boolean done = LettuceFutures.awaitAll(timeout, TimeUnit.MILLISECONDS, futures.toArray(new RedisFuture[0]));
-
 			List<Object> results = new ArrayList<>(futures.size());
-
 			Exception problem = null;
 
 			if (done) {
@@ -645,9 +643,7 @@ public void openPipeline() {
 
 			if (problem != null) {
 				throw new RedisPipelineException(problem, results);
-			}
-
-			if (done) {
+			} else if (done) {
 				return results;
 			}
 

src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionUnitTests.java

@@ -39,7 +39,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.concurrent.TimeUnit;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
@@ -49,7 +48,6 @@
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 
-import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.dao.InvalidDataAccessResourceUsageException;
 import org.springframework.dao.QueryTimeoutException;
 import org.springframework.data.redis.connection.AbstractConnectionUnitTestBase;
@@ -66,6 +64,8 @@
 import org.springframework.test.util.ReflectionTestUtils;
 
 /**
+ * Unit tests for {@link LettuceConnection}.
+ *
  * @author Christoph Strobl
  * @author Mark Paluch
  */
@@ -101,7 +101,7 @@ public void setUp() throws InvocationTargetException, IllegalAccessException {
 
 		when(statefulConnectionMock.async()).thenReturn(asyncCommandsMock);
 		when(statefulConnectionMock.sync()).thenReturn(commandsMock);
-		connection = new LettuceConnection(0, clientMock);
+		connection = new LettuceConnection(1, clientMock);
 	}
 
 	@Nested
@@ -433,21 +433,25 @@ protected void setOutput(ByteBuffer bytes) {
 	}
 
 	@Nested
-	class ClosePipelineUnitTests {
+	class LettucePipelineConnectionUnitTests extends BasicUnitTests {
+
+		@BeforeEach
+		public void setUp() throws InvocationTargetException, IllegalAccessException {
+			connection.openPipeline();
+		}
 
 		@Test // GH-3346
 		void closePipelineShouldNotDoubleWrapTimeoutException() {
 
+			Command<?, ?, ?> cmd = new Command<>(CommandType.SET, new StatusOutput<>(ByteArrayCodec.INSTANCE));
+			AsyncCommand<?, ?, ?> future = new AsyncCommand<>(cmd);
+
+			when(asyncCommandsMock.set(any(byte[].class), any(byte[].class))).thenReturn((RedisFuture) future);
 			connection.openPipeline();
 			connection.set("foo".getBytes(), "bar".getBytes());
 
-			try (MockedStatic<LettuceFutures> lf = Mockito.mockStatic(LettuceFutures.class)) {
-				lf.when(() -> LettuceFutures.awaitAll(anyLong(), any(TimeUnit.class), any())).thenReturn(false);
-
-				assertThatThrownBy(() -> connection.closePipeline())
-						.isInstanceOf(RedisPipelineException.class)
-						.hasCauseInstanceOf(QueryTimeoutException.class);
-			}
+			assertThatThrownBy(() -> connection.closePipeline()).isInstanceOf(RedisPipelineException.class)
+					.hasCauseInstanceOf(QueryTimeoutException.class);
 		}
 
 		@SuppressWarnings({ "rawtypes", "unchecked" })
@@ -463,22 +467,8 @@ void closePipelineShouldNotDoubleWrapCommandException() {
 			connection.openPipeline();
 			connection.set("foo".getBytes(), "bar".getBytes());
 
-			try (MockedStatic<LettuceFutures> lf = Mockito.mockStatic(LettuceFutures.class)) {
-				lf.when(() -> LettuceFutures.awaitAll(anyLong(), any(TimeUnit.class), any())).thenReturn(true);
-
-				assertThatThrownBy(() -> connection.closePipeline())
-						.isInstanceOf(RedisPipelineException.class)
-						.hasCauseInstanceOf(InvalidDataAccessApiUsageException.class);
-			}
-		}
-	}
-
-	@Nested
-	class LettucePipelineConnectionUnitTests extends BasicUnitTests {
-
-		@BeforeEach
-		public void setUp() throws InvocationTargetException, IllegalAccessException {
-			connection.openPipeline();
+			assertThatThrownBy(() -> connection.closePipeline()).isInstanceOf(RedisPipelineException.class)
+					.hasCauseExactlyInstanceOf(RedisException.class);
 		}
 
 		@Test // DATAREDIS-528