Polishing.

Use parametrized tests for Command enum verification.

See #3191
Original pull request: #3193

Author: mp911de

src/test/java/org/springframework/data/redis/core/RedisCommandUnitTests.java

@@ -17,9 +17,10 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import java.util.Arrays;
-
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+
 import org.springframework.test.util.ReflectionTestUtils;
 
 /**
@@ -106,37 +107,34 @@ void shouldThrowExceptionOnInvalidArgumentCountForZaddWhenExpectedMinimalMatch()
 				.withMessageContaining("ZADD command requires at least 3 arguments");
 	}
 
-	@Test // GH-2644
-	void isRepresentedByIsCorrectForAllCommandsAndTheirAliases() {
-
-		for (RedisCommand command : RedisCommand.values()) {
+	@ParameterizedTest(name = "{0}") // GH-2644
+	@EnumSource(RedisCommand.class)
+	void isRepresentedByIsCorrectForAllCommandsAndTheirAliases(RedisCommand command) {
 
-			assertThat(command.isRepresentedBy(command.name())).isTrue();
-			assertThat(command.isRepresentedBy(command.name().toLowerCase())).isTrue();
+		assertThat(command.isRepresentedBy(command.name())).isTrue();
+		assertThat(command.isRepresentedBy(command.name().toLowerCase())).isTrue();
 
-			for (String alias : command.getAliases()) {
-				assertThat(command.isRepresentedBy(alias)).isTrue();
-				assertThat(command.isRepresentedBy(alias.toUpperCase())).isTrue();
-			}
+		for (String alias : command.getAliases()) {
+			assertThat(command.isRepresentedBy(alias)).isTrue();
+			assertThat(command.isRepresentedBy(alias.toUpperCase())).isTrue();
 		}
 	}
 
-	@Test // GH-2646
-	void commandRequiresArgumentsIsCorrect() {
+	@ParameterizedTest(name = "{0}") // GH-2646
+	@EnumSource(RedisCommand.class)
+	void commandRequiresArgumentsIsCorrect(RedisCommand command) {
 
-		Arrays.stream(RedisCommand.values())
-				.forEach(command -> assertThat(command.requiresArguments())
-						.describedAs("Redis command [%s] failed required arguments check", command)
-						.isEqualTo((int) ReflectionTestUtils.getField(command, "minArgs") > 0));
+		assertThat(command.requiresArguments()).describedAs("Redis command [%s] failed required arguments check", command)
+				.isEqualTo((int) ReflectionTestUtils.getField(command, "minArgs") > 0);
 	}
 
-	@Test // GH-2646
-	void commandRequiresExactNumberOfArgumentsIsCorrect() {
+	@ParameterizedTest(name = "{0}") // GH-2646
+	@EnumSource(RedisCommand.class)
+	void commandRequiresExactNumberOfArgumentsIsCorrect(RedisCommand command) {
 
-		Arrays.stream(RedisCommand.values())
-				.forEach(command -> assertThat(command.requiresExactNumberOfArguments())
-						.describedAs("Redis command [%s] failed requires exact arguments check".formatted(command.name())).isEqualTo(
-								ReflectionTestUtils.getField(command, "minArgs") == ReflectionTestUtils.getField(command, "maxArgs")));
+		assertThat(command.requiresExactNumberOfArguments())
+				.describedAs("Redis command [%s] failed requires exact arguments check".formatted(command.name())).isEqualTo(
+						ReflectionTestUtils.getField(command, "minArgs") == ReflectionTestUtils.getField(command, "maxArgs"));
 	}
 
 }

src/test/java/org/springframework/data/redis/core/TransactionalStringRedisTemplateTests.java

@@ -15,7 +15,8 @@
  */
 package org.springframework.data.redis.core;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -35,6 +36,7 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
+
 import org.springframework.context.Lifecycle;
 import org.springframework.data.redis.SettingsUtils;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
@@ -44,14 +46,16 @@
 import org.springframework.transaction.support.TransactionTemplate;
 
 /**
+ * Transactional integration tests for {@link StringRedisTemplate}.
+ *
  * @author Christoph Strobl
  */
 @ParameterizedClass
 @MethodSource("argumentsStream")
-public class TransactionalStringRedisTemplateTests {
+class TransactionalStringRedisTemplateTests {
 
-	RedisConnectionFactory redisConnectionFactory;
-	StringRedisTemplate stringTemplate;
+	private RedisConnectionFactory redisConnectionFactory;
+	private StringRedisTemplate stringTemplate;
 
 	TransactionalStringRedisTemplateTests(RedisConnectionFactory redisConnectionFactory) {
 		this.redisConnectionFactory = redisConnectionFactory;
@@ -86,8 +90,8 @@ void visibilityDuringManagedTransaction() throws SQLException {
 
 		stringTemplate.opsForSet().add("myset", "outside");
 
-		DataSource ds = Mockito.mock(DataSource.class);
-		Mockito.when(ds.getConnection()).thenReturn(Mockito.mock(Connection.class));
+		DataSource ds = mock(DataSource.class);
+		Mockito.when(ds.getConnection()).thenReturn(mock(Connection.class));
 
 		DataSourceTransactionManager txMgr = new DataSourceTransactionManager(ds);