Modify SentinelCommandsTest (#3443)

Author: sazzad16

src/test/java/redis/clients/jedis/commands/jedis/SentinelCommandsTest.java

@@ -1,9 +1,16 @@
 package redis.clients.jedis.commands.jedis;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.hamcrest.Matchers;
 import org.junit.Test;
 
 import redis.clients.jedis.HostAndPort;
@@ -12,47 +19,63 @@
 
 public class SentinelCommandsTest {
 
-  protected static HostAndPort master2 = HostAndPorts.getRedisServers().get(2);
-  protected static HostAndPort replica2 = HostAndPorts.getRedisServers().get(3);
+  protected static final String MASTER_NAME = "mymaster";
+
+  protected static final List<HostAndPort> nodes =
+      Arrays.asList(HostAndPorts.getRedisServers().get(2), HostAndPorts.getRedisServers().get(3));
+  protected static final Set<String> nodesPorts = nodes.stream()
+      .map(HostAndPort::getPort).map(String::valueOf).collect(Collectors.toSet());
 
-  protected static HostAndPort sentinel2_1 = HostAndPorts.getSentinelServers().get(1);
-  protected static HostAndPort sentinel2_2 = HostAndPorts.getSentinelServers().get(3);
+  protected static final List<HostAndPort> sentinels2 = 
+      Arrays.asList(HostAndPorts.getSentinelServers().get(1), HostAndPorts.getSentinelServers().get(3));
 
   @Test
-  public void myIdSentinels() {
-    String id1;
-    try (Jedis sentinel = new Jedis(sentinel2_1)) {
-      id1 = sentinel.sentinelMyId();
-      assertTrue(id1.matches("[0-9a-f]+"));
-    }
+  public void myIdAndSentinels() {
+    Map<String, Integer> idToPort = new HashMap<>();
+    sentinels2.forEach((hap) -> {
+      try (Jedis sentinel = new Jedis(hap)) {
+        String id = sentinel.sentinelMyId();
+        assertThat(id, Matchers.not(Matchers.emptyOrNullString()));
+        idToPort.put(id, hap.getPort());
+      }
+    });
+    assertEquals(2, idToPort.size());
 
-    try (Jedis sentinel2 = new Jedis(sentinel2_2)) {
-      Map<String, String> details1 = sentinel2.sentinelSentinels("mymaster").get(0);
-      assertEquals(id1, details1.get("runid"));
+    try (Jedis sentinel = new Jedis(sentinels2.stream().findAny().get())) {
+      List<Map<String, String>> detailsList = sentinel.sentinelSentinels(MASTER_NAME);
+      assertThat(detailsList, Matchers.not(Matchers.empty()));
+      detailsList.forEach((details)
+          -> assertEquals(idToPort.get(details.get("runid")),
+              Integer.valueOf(details.get("port"))));
     }
   }
 
   @Test
-  public void masterMasters() {
-    String runId;
-    try (Jedis sentinel = new Jedis(sentinel2_1)) {
-      Map<String, String> details = sentinel.sentinelMaster("mymaster");
-      assertEquals("mymaster", details.get("name"));
+  public void masterAndMasters() {
+    String runId, port;
+    try (Jedis sentinel = new Jedis(sentinels2.get(0))) {
+      Map<String, String> details = sentinel.sentinelMaster(MASTER_NAME);
+      assertEquals(MASTER_NAME, details.get("name"));
       runId = details.get("runid");
+      port = details.get("port");
+      assertThat(port, Matchers.in(nodesPorts));
     }
 
-    try (Jedis sentinel2 = new Jedis(sentinel2_2)) {
+    try (Jedis sentinel2 = new Jedis(sentinels2.get(1))) {
       Map<String, String> details = sentinel2.sentinelMasters().get(0);
-      assertEquals("mymaster", details.get("name"));
+      assertEquals(MASTER_NAME, details.get("name"));
       assertEquals(runId, details.get("runid"));
+      assertEquals(port, details.get("port"));
     }
   }
 
   @Test
   public void replicas() {
-    try (Jedis sentinel = new Jedis(sentinel2_1)) {
-      Map<String, String> details = sentinel.sentinelReplicas("mymaster").get(0);
-      assertEquals(Integer.toString(replica2.getPort()), details.get("port"));
+    try (Jedis sentinel = new Jedis(sentinels2.stream().findAny().get())) {
+      List<Map<String, String>> detailsList = sentinel.sentinelReplicas(MASTER_NAME);
+      assertThat(detailsList, Matchers.not(Matchers.empty()));
+      detailsList.forEach((details)
+          -> assertThat(details.get("port"), Matchers.in(nodesPorts)));
     }
   }
 }