Fix JedisConnectionPipelineIntegrationTests and JedisConnectionTransa…

…ctionIntegrationTests. Closes spring-projects#2612
jxblum · Sep 19, 2023 · c639531 · c639531
1 parent 8255358
commit c639531
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 15 deletions.
diff --git a/...st/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java b/...st/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java
@@ -2036,7 +2036,7 @@ void testZDiff() {
 		actual.add(connection.zAdd("otherset", 4, "James"));
 		actual.add(connection.zDiff("myset", "otherset"));
 		actual.add(connection.zDiffWithScores("myset", "otherset"));
-		verifyResults(Arrays.asList(new Object[] { true, true, true, true, true, Collections.singleton("Joe"),
+		verifyResults(Arrays.asList(new Object[] { true, true, true, true, true, Collections.singletonList("Joe"),
 				Collections.singleton(new DefaultStringTuple("Joe", 4)) }));
 	}
 
@@ -2065,9 +2065,10 @@ void testZInter() {
 		actual.add(connection.zAdd("otherset", 4, "James"));
 		actual.add(connection.zInter("myset", "otherset"));
 		actual.add(connection.zInterWithScores("myset", "otherset"));
-		verifyResults(Arrays.asList(new Object[] { true, true, true, true, true,
-				new LinkedHashSet<>(Arrays.asList("Bob", "James")),
-				new LinkedHashSet<>(Arrays.asList(new DefaultStringTuple("Bob", 3d), new DefaultStringTuple("James", 5))) }));
+
+		verifyResults(Arrays.asList(new Object[] { true, true, true, true, true, Arrays.asList("Bob", "James"),
+				new LinkedHashSet<>(Arrays.asList(new DefaultStringTuple("Bob", 3d),
+						new DefaultStringTuple("James", 5))) }));
 	}
 
 	@Test // GH-2042
@@ -2082,9 +2083,9 @@ void testZInterAggWeights() {
 		actual.add(connection.zInter("myset", "otherset"));
 		actual.add(connection.zInterWithScores(Aggregate.MAX, new int[] { 2, 3 }, "myset", "otherset"));
 
-		verifyResults(Arrays.asList(new Object[] { true, true, true, true, true,
-				new LinkedHashSet<>(Arrays.asList("Bob", "James")),
-				new LinkedHashSet<>(Arrays.asList(new DefaultStringTuple("Bob", 4d), new DefaultStringTuple("James", 12d))) }));
+		verifyResults(Arrays.asList(new Object[] { true, true, true, true, true, Arrays.asList("Bob", "James"),
+				new LinkedHashSet<>(Arrays.asList(new DefaultStringTuple("Bob", 4d),
+						new DefaultStringTuple("James", 12d))) }));
 	}
 
 	@Test
@@ -2374,15 +2375,16 @@ void testZUnion() {
 		actual.add(connection.zAdd("otherset", 4, "James"));
 		actual.add(connection.zUnion("myset", "otherset"));
 		actual.add(connection.zUnionWithScores("myset", "otherset"));
-		verifyResults(Arrays
-				.asList(new Object[] { true, true, true, true, true, new LinkedHashSet<>(Arrays.asList("Bob", "James", "Joe")),
-						new LinkedHashSet<>(Arrays.asList(new DefaultStringTuple("Bob", 3d), new DefaultStringTuple("James", 5),
-								new DefaultStringTuple("Joe", 4))) }));
+
+		verifyResults(Arrays.asList(new Object[] { true, true, true, true, true, Arrays.asList("Bob", "Joe", "James"),
+	   			new LinkedHashSet<>(Arrays.asList(new DefaultStringTuple("Bob", 3d),
+						new DefaultStringTuple("Joe", 4), new DefaultStringTuple("James", 5))) }));
 	}
 
 	@Test // GH-2042
 	@EnabledOnCommand("ZUNION")
 	void testZUnionAggWeights() {
+
 		actual.add(connection.zAdd("myset", 2, "Bob"));
 		actual.add(connection.zAdd("myset", 1, "James"));
 		actual.add(connection.zAdd("myset", 4, "Joe"));
@@ -2391,9 +2393,9 @@ void testZUnionAggWeights() {
 		actual.add(connection.zUnion("myset", "otherset"));
 		actual.add(connection.zUnionWithScores(Aggregate.MAX, new int[] { 2, 3 }, "myset", "otherset"));
 
-		verifyResults(Arrays
-				.asList(new Object[] { true, true, true, true, true, new LinkedHashSet<>(Arrays.asList("Bob", "James", "Joe")),
-						new LinkedHashSet<>(Arrays.asList(new DefaultStringTuple("Bob", 4d), new DefaultStringTuple("Joe", 8d),
+		verifyResults(Arrays.asList(new Object[] { true, true, true, true, true, Arrays.asList("Bob", "Joe", "James"),
+	   			new LinkedHashSet<>(Arrays.asList(new DefaultStringTuple("Bob", 4d),
+						new DefaultStringTuple("Joe", 8d),
 								new DefaultStringTuple("James", 12d))) }));
 	}
 

diff --git a/...org/springframework/data/redis/connection/AbstractConnectionPipelineIntegrationTests.java b/...org/springframework/data/redis/connection/AbstractConnectionPipelineIntegrationTests.java
@@ -20,6 +20,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.IntStream;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -167,12 +168,17 @@ protected void initConnection() {
 
 	@Override
 	protected void verifyResults(List<Object> expected) {
+
 		List<Object> expectedPipeline = new ArrayList<>();
-		for (int i = 0; i < actual.size(); i++) {
+
+		for (int index = 0; index < actual.size(); index++) {
 			expectedPipeline.add(null);
 		}
+
 		assertThat(actual).isEqualTo(expectedPipeline);
+
 		List<Object> results = getResults();
+
 		assertThat(results).isEqualTo(expected);
 	}