Fix NPE in test clean up

redis · Nov 19, 2024 · 5066271 · 5066271
1 parent 5cfdb42
commit 5066271
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/src/test/java/redis/clients/jedis/commands/jedis/ClusterJedisCommandsTestBase.java b/src/test/java/redis/clients/jedis/commands/jedis/ClusterJedisCommandsTestBase.java
@@ -58,7 +58,6 @@ public void setUp() throws InterruptedException {
     int[] node1Slots = new int[slotsPerNode];
     int[] node2Slots = new int[slotsPerNode + 1];
     int[] node3Slots = new int[slotsPerNode];
-//    for (int i = 0, slot1 = 0, slot2 = 0, slot3 = 0; i < JedisCluster.HASHSLOTS; i++) {
     for (int i = 0, slot1 = 0, slot2 = 0, slot3 = 0; i < CLUSTER_HASHSLOTS; i++) {
       if (i < slotsPerNode) {
         node1Slots[slot1++] = i;
@@ -76,28 +75,25 @@ public void setUp() throws InterruptedException {
     waitForClusterReady();
 
     jedisClusterNode.add(new HostAndPort("127.0.0.1", 7379));
-//    cluster = new JedisCluster(jedisClusterNode, 2000, 2000, 5, "cluster", new JedisPoolConfig());
-//    cluster = new JedisCluster(jedisClusterNode, DefaultJedisClientConfig.builder().password("cluster").build(), 5);
     cluster = new JedisCluster(jedisClusterNode, null, "cluster");
-
   }
 
   @AfterClass
   public static void cleanUp() {
     int slotTest = JedisClusterCRC16.getSlot("test");
     int slot51 = JedisClusterCRC16.getSlot("51");
-    String node3Id = getNodeId(node3.clusterNodes());
-    node2.clusterSetSlotNode(slotTest, node3Id);
-    node2.clusterSetSlotNode(slot51, node3Id);
-    node2.clusterDelSlots(slotTest, slot51);
+    if (node3 != null ) {
+      String node3Id = getNodeId(node3.clusterNodes());
+      node2.clusterSetSlotNode(slotTest, node3Id);
+      node2.clusterSetSlotNode(slot51, node3Id);
+      node2.clusterDelSlots(slotTest, slot51);
+    }
   }
 
   @After
   public void tearDown() {
     // clear all slots
-//    int[] slotsToDelete = new int[JedisCluster.HASHSLOTS];
     int[] slotsToDelete = new int[CLUSTER_HASHSLOTS];
-//    for (int i = 0; i < JedisCluster.HASHSLOTS; i++) {
     for (int i = 0; i < CLUSTER_HASHSLOTS; i++) {
       slotsToDelete[i] = i;
     }

diff --git a/...t/java/redis/clients/jedis/commands/jedis/ClusterShardedPublishSubscribeCommandsTest.java b/...t/java/redis/clients/jedis/commands/jedis/ClusterShardedPublishSubscribeCommandsTest.java
@@ -9,9 +9,6 @@
 import java.util.Map;
 
 import io.redis.test.annotations.SinceRedisVersion;
-import io.redis.test.utils.RedisVersion;
-import io.redis.test.utils.RedisVersionRule;
-import org.junit.Rule;
 import org.junit.Test;
 
 import redis.clients.jedis.BinaryJedisShardedPubSub;