Rename tests 'Cluster*'

Author: ggivo

src/main/java/redis/clients/jedis/UnifiedJedis.java

@@ -32,7 +32,6 @@
 import redis.clients.jedis.params.VSimParams;
 import redis.clients.jedis.resps.RawVector;
 import redis.clients.jedis.json.JsonObjectMapper;
-import redis.clients.jedis.mcf.MultiDbCommandExecutor;
 import redis.clients.jedis.mcf.MultiDbPipeline;
 import redis.clients.jedis.mcf.MultiDbConnectionProvider;
 import redis.clients.jedis.mcf.MultiDbTransaction;

src/test/java/redis/clients/jedis/mcf/ClusterEvaluateThresholdsTest.java renamed to src/test/java/redis/clients/jedis/mcf/DatabaseEvaluateThresholdsTest.java

@@ -17,29 +17,29 @@
 /**
  * Tests for circuit breaker thresholds: both failure-rate threshold and minimum number of failures
  * must be exceeded to trigger failover. Uses a real CircuitBreaker and real Retry, but mocks the
- * provider and cluster wiring to avoid network I/O.
+ * provider and {@link Database} wiring to avoid network I/O.
  */
-public class ClusterEvaluateThresholdsTest {
+public class DatabaseEvaluateThresholdsTest {
 
   private MultiDbConnectionProvider provider;
-  private Database cluster;
+  private Database database;
   private CircuitBreaker circuitBreaker;
   private CircuitBreaker.Metrics metrics;
 
   @BeforeEach
   public void setup() {
     provider = mock(MultiDbConnectionProvider.class);
-    cluster = mock(Database.class);
+    database = mock(Database.class);
 
     circuitBreaker = mock(CircuitBreaker.class);
     metrics = mock(CircuitBreaker.Metrics.class);
 
-    when(cluster.getCircuitBreaker()).thenReturn(circuitBreaker);
+    when(database.getCircuitBreaker()).thenReturn(circuitBreaker);
     when(circuitBreaker.getMetrics()).thenReturn(metrics);
     when(circuitBreaker.getState()).thenReturn(CircuitBreaker.State.CLOSED);
 
     // Configure the mock to call the real evaluateThresholds method
-    doCallRealMethod().when(cluster).evaluateThresholds(anyBoolean());
+    doCallRealMethod().when(database).evaluateThresholds(anyBoolean());
 
   }
 
@@ -50,13 +50,13 @@ public void setup() {
    */
   @Test
   public void belowMinFailures_doesNotFailover() {
-    when(cluster.getCircuitBreakerMinNumOfFailures()).thenReturn(3);
+    when(database.getCircuitBreakerMinNumOfFailures()).thenReturn(3);
     when(metrics.getNumberOfFailedCalls()).thenReturn(1); // +1 becomes 2, still < 3
     when(metrics.getNumberOfSuccessfulCalls()).thenReturn(0);
-    when(cluster.getCircuitBreakerFailureRateThreshold()).thenReturn(50.0f);
+    when(database.getCircuitBreakerFailureRateThreshold()).thenReturn(50.0f);
     when(circuitBreaker.getState()).thenReturn(CircuitBreaker.State.CLOSED);
 
-    cluster.evaluateThresholds(false);
+    database.evaluateThresholds(false);
     verify(circuitBreaker, never()).transitionToOpenState();
     verify(provider, never()).switchToHealthyDatabase(any(), any());
   }
@@ -68,13 +68,13 @@ public void belowMinFailures_doesNotFailover() {
    */
   @Test
   public void minFailuresAndRateExceeded_triggersOpenState() {
-    when(cluster.getCircuitBreakerMinNumOfFailures()).thenReturn(3);
+    when(database.getCircuitBreakerMinNumOfFailures()).thenReturn(3);
     when(metrics.getNumberOfFailedCalls()).thenReturn(2); // +1 becomes 3, reaching minFailures
     when(metrics.getNumberOfSuccessfulCalls()).thenReturn(0);
-    when(cluster.getCircuitBreakerFailureRateThreshold()).thenReturn(50.0f);
+    when(database.getCircuitBreakerFailureRateThreshold()).thenReturn(50.0f);
     when(circuitBreaker.getState()).thenReturn(CircuitBreaker.State.CLOSED);
 
-    cluster.evaluateThresholds(false);
+    database.evaluateThresholds(false);
     verify(circuitBreaker, times(1)).transitionToOpenState();
   }
 
@@ -86,13 +86,13 @@ public void minFailuresAndRateExceeded_triggersOpenState() {
    */
   @Test
   public void rateBelowThreshold_doesNotFailover() {
-    when(cluster.getCircuitBreakerMinNumOfFailures()).thenReturn(3);
+    when(database.getCircuitBreakerMinNumOfFailures()).thenReturn(3);
     when(metrics.getNumberOfSuccessfulCalls()).thenReturn(3);
     when(metrics.getNumberOfFailedCalls()).thenReturn(2); // +1 becomes 3, rate = 3/(3+3) = 50%
-    when(cluster.getCircuitBreakerFailureRateThreshold()).thenReturn(80.0f);
+    when(database.getCircuitBreakerFailureRateThreshold()).thenReturn(80.0f);
     when(circuitBreaker.getState()).thenReturn(CircuitBreaker.State.CLOSED);
 
-    cluster.evaluateThresholds(false);
+    database.evaluateThresholds(false);
 
     verify(circuitBreaker, never()).transitionToOpenState();
     verify(provider, never()).switchToHealthyDatabase(any(), any());
@@ -165,13 +165,13 @@ public void providerBuilder_zeroRate_mapsToHundredAndHugeMinCalls() {
   public void thresholdMatrix(int minFailures, float ratePercent, int successes, int failures,
       boolean lastFailRecorded, boolean expectOpenState) {
 
-    when(cluster.getCircuitBreakerMinNumOfFailures()).thenReturn(minFailures);
+    when(database.getCircuitBreakerMinNumOfFailures()).thenReturn(minFailures);
     when(metrics.getNumberOfSuccessfulCalls()).thenReturn(successes);
     when(metrics.getNumberOfFailedCalls()).thenReturn(failures);
-    when(cluster.getCircuitBreakerFailureRateThreshold()).thenReturn(ratePercent);
+    when(database.getCircuitBreakerFailureRateThreshold()).thenReturn(ratePercent);
     when(circuitBreaker.getState()).thenReturn(CircuitBreaker.State.CLOSED);
 
-    cluster.evaluateThresholds(lastFailRecorded);
+    database.evaluateThresholds(lastFailRecorded);
 
     if (expectOpenState) {
       verify(circuitBreaker, times(1)).transitionToOpenState();

src/test/java/redis/clients/jedis/mcf/MultiDbCommandExecutorThresholdsTest.java renamed to src/test/java/redis/clients/jedis/mcf/MultiDbCircuitBreakerThresholdsTest.java

@@ -28,7 +28,7 @@
  * must be exceeded to trigger failover. Uses a real CircuitBreaker and real Retry, but mocks the
  * provider and cluster wiring to avoid network I/O.
  */
-public class CircuitBreakerThresholdsTest {
+public class MultiDbCircuitBreakerThresholdsTest {
 
   private MultiDbConnectionProvider realProvider;
   private MultiDbConnectionProvider spyProvider;

src/test/java/redis/clients/jedis/mcf/MultiClusterDynamicEndpointUnitTest.java renamed to src/test/java/redis/clients/jedis/mcf/MultiDbConnectionProviderDynamicEndpointUnitTest.java

@@ -5,7 +5,6 @@
 import org.mockito.MockedConstruction;
 
 import redis.clients.jedis.Connection;
-import redis.clients.jedis.ConnectionPool;
 import redis.clients.jedis.DefaultJedisClientConfig;
 import redis.clients.jedis.EndpointConfig;
 import redis.clients.jedis.HostAndPort;
@@ -21,7 +20,7 @@
 import static org.mockito.Mockito.mockConstruction;
 import static org.mockito.Mockito.when;
 
-public class MultiClusterDynamicEndpointUnitTest {
+public class MultiDbConnectionProviderDynamicEndpointUnitTest {
 
   private MultiDbConnectionProvider provider;
   private JedisClientConfig clientConfig;
@@ -41,26 +40,26 @@ void setUp() {
     provider = new MultiDbConnectionProvider(multiConfig);
   }
 
-  // Helper method to create cluster configurations
+  // Helper method to create database configurations
   private DatabaseConfig createDatabaseConfig(HostAndPort hostAndPort, float weight) {
     // Disable health check for unit tests to avoid real connections
     return DatabaseConfig.builder(hostAndPort, clientConfig).weight(weight)
         .healthCheckEnabled(false).build();
   }
 
   @Test
-  void testAddNewCluster() {
+  void testAddNewDatabase() {
     DatabaseConfig newConfig = createDatabaseConfig(endpoint2.getHostAndPort(), 2.0f);
 
     // Should not throw exception
     assertDoesNotThrow(() -> provider.add(newConfig));
 
-    // Verify the cluster was added by checking it can be retrieved
+    // Verify the database was added by checking it can be retrieved
     assertNotNull(provider.getDatabase(endpoint2.getHostAndPort()));
   }
 
   @Test
-  void testAddDuplicateCluster() {
+  void testAddDuplicateDatabase() {
     DatabaseConfig duplicateConfig = createDatabaseConfig(endpoint1.getHostAndPort(), 2.0f);
 
     // Should throw validation exception for duplicate endpoint
@@ -80,19 +79,18 @@ void testRemoveExistingCluster() {
 
     try (MockedConstruction<TrackingConnectionPool> mockedPool = mockPool(mockConnection)) {
       // Create initial provider with endpoint1
-      DatabaseConfig clusterConfig1 = createDatabaseConfig(endpoint1.getHostAndPort(), 1.0f);
+      DatabaseConfig dbConfig1 = createDatabaseConfig(endpoint1.getHostAndPort(), 1.0f);
 
-      MultiDbConfig multiConfig = MultiDbConfig.builder(new DatabaseConfig[] { clusterConfig1 })
-          .build();
+      MultiDbConfig multiConfig = MultiDbConfig.builder(new DatabaseConfig[] { dbConfig1 }).build();
 
       try (MultiDbConnectionProvider providerWithMockedPool = new MultiDbConnectionProvider(
           multiConfig)) {
 
-        // Add endpoint2 as second cluster
+        // Add endpoint2 as second database
         DatabaseConfig newConfig = createDatabaseConfig(endpoint2.getHostAndPort(), 2.0f);
         providerWithMockedPool.add(newConfig);
 
-        // Now remove endpoint1 (original cluster)
+        // Now remove endpoint1 (original database)
         assertDoesNotThrow(() -> providerWithMockedPool.remove(endpoint1.getHostAndPort()));
 
         // Verify endpoint1 was removed
@@ -119,8 +117,8 @@ void testRemoveNonExistentCluster() {
   }
 
   @Test
-  void testRemoveLastRemainingCluster() {
-    // Should throw validation exception when trying to remove the last cluster
+  void testRemoveLastRemainingDatabase() {
+    // Should throw validation exception when trying to remove the last database
     assertThrows(JedisValidationException.class, () -> provider.remove(endpoint1.getHostAndPort()));
   }
 
@@ -132,7 +130,7 @@ void testRemoveNullEndpoint() {
 
   @Test
   void testAddAndRemoveMultipleClusters() {
-    // Add endpoint2 as second cluster
+    // Add endpoint2 as second database
     DatabaseConfig config2 = createDatabaseConfig(endpoint2.getHostAndPort(), 2.0f);
 
     // Create a third endpoint for this test
@@ -142,30 +140,30 @@ void testAddAndRemoveMultipleClusters() {
     provider.add(config2);
     provider.add(config3);
 
-    // Verify all clusters exist
+    // Verify all databases exist
     assertNotNull(provider.getDatabase(endpoint1.getHostAndPort()));
     assertNotNull(provider.getDatabase(endpoint2.getHostAndPort()));
     assertNotNull(provider.getDatabase(endpoint3));
 
     // Remove endpoint2
     provider.remove(endpoint2.getHostAndPort());
 
-    // Verify correct cluster was removed
+    // Verify correct database was removed
     assertNull(provider.getDatabase(endpoint2.getHostAndPort()));
     assertNotNull(provider.getDatabase(endpoint1.getHostAndPort()));
     assertNotNull(provider.getDatabase(endpoint3));
   }
 
   @Test
   void testActiveClusterHandlingOnAdd() {
-    // The initial cluster should be active
+    // The initial database should be active
     assertNotNull(provider.getDatabase());
 
     // Add endpoint2 with higher weight
     DatabaseConfig newConfig = createDatabaseConfig(endpoint2.getHostAndPort(), 5.0f);
     provider.add(newConfig);
 
-    // Active cluster should still be valid (implementation may or may not switch)
+    // Active database should still be valid (implementation may or may not switch)
     assertNotNull(provider.getDatabase());
   }
 
@@ -176,26 +174,25 @@ void testActiveClusterHandlingOnRemove() {
 
     try (MockedConstruction<TrackingConnectionPool> mockedPool = mockPool(mockConnection)) {
       // Create initial provider with endpoint1
-      DatabaseConfig clusterConfig1 = createDatabaseConfig(endpoint1.getHostAndPort(), 1.0f);
+      DatabaseConfig dbConfig1 = createDatabaseConfig(endpoint1.getHostAndPort(), 1.0f);
 
-      MultiDbConfig multiConfig = MultiDbConfig.builder(new DatabaseConfig[] { clusterConfig1 })
-          .build();
+      MultiDbConfig multiConfig = MultiDbConfig.builder(new DatabaseConfig[] { dbConfig1 }).build();
 
       try (MultiDbConnectionProvider providerWithMockedPool = new MultiDbConnectionProvider(
           multiConfig)) {
 
-        // Add endpoint2 as second cluster
+        // Add endpoint2 as second database
         DatabaseConfig newConfig = createDatabaseConfig(endpoint2.getHostAndPort(), 2.0f);
         providerWithMockedPool.add(newConfig);
 
-        // Get current active cluster
+        // Get current active database
         Object initialActiveCluster = providerWithMockedPool.getDatabase();
         assertNotNull(initialActiveCluster);
 
-        // Remove endpoint1 (original cluster, might be active)
+        // Remove endpoint1 (original database, might be active)
         providerWithMockedPool.remove(endpoint1.getHostAndPort());
 
-        // Should still have an active cluster
+        // Should still have an active database
         assertNotNull(providerWithMockedPool.getDatabase());
       }
     }

src/test/java/redis/clients/jedis/mcf/MultiClusterFailoverAttemptsConfigTest.java renamed to src/test/java/redis/clients/jedis/mcf/MultiDbConnectionProviderFailoverAttemptsConfigTest.java

@@ -22,9 +22,9 @@
 
 /**
  * Tests for how getMaxNumFailoverAttempts and getDelayInBetweenFailoverAttempts impact
- * MultiDbConnectionProvider behaviour when no healthy clusters are available.
+ * MultiDbConnectionProvider behaviour when no healthy databases are available.
  */
-public class MultiClusterFailoverAttemptsConfigTest {
+public class MultiDbConnectionProviderFailoverAttemptsConfigTest {
 
   private HostAndPort endpoint0 = new HostAndPort("purposefully-incorrect", 0000);
   private HostAndPort endpoint1 = new HostAndPort("purposefully-incorrect", 0001);
@@ -47,7 +47,7 @@ void setUp() throws Exception {
 
     provider = new MultiDbConnectionProvider(builder.build());
 
-    // Disable both clusters to force handleNoHealthyCluster path
+    // Disable both databases to force handleNoHealthyCluster path
     provider.getDatabase(endpoint0).setDisabled(true);
     provider.getDatabase(endpoint1).setDisabled(true);
   }