Test default protocol (RESP2) and RESP3 in same workflow (#3409)

sazzad16 · web-flow · commit b5b9ca71cfd1 · 2023-05-11T21:14:13.000+06:00
* Test default protocol (RESP2) and RESP3 in same workflow

* make start separately

as make test does make stop when successful

* Refine step names
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -54,10 +54,20 @@ jobs:
         env:
           JVM_OPTS: -Xmx3200m
           TERM: dumb
-      - name: redismod docker
+      - name: Make - start
+        run: make start
+      - name: Docker - mod or stack
         run: docker run -p 52567:6379 -d redis/redis-stack-server:edge
-      - name: Run tests
+      - name: Test commands - default protocol
+        run: mvn -Dtest="redis.clients.jedis.commands.**" test
+      - name: Test commands - RESP3 protocol
+        run: mvn -DjedisProtocol=3 -Dtest="redis.clients.jedis.commands.**" test
+      - name: Test module commands - default protocol
         run: mvn -DmodulesDocker="localhost:52567" -Dtest="redis.clients.jedis.modules.**" test
+      - name: Test module commands - RESP3 protocol
+        run: mvn -DjedisProtocol=3 -DmodulesDocker="localhost:52567" -Dtest="redis.clients.jedis.modules.**" test
+      - name: Make - stop
+        run: make stop
       - name: Codecov
         run: |
           bash <(curl -s https://codecov.io/bash)
diff --git a/src/test/java/redis/clients/jedis/commands/jedis/JedisCommandsTestBase.java b/src/test/java/redis/clients/jedis/commands/jedis/JedisCommandsTestBase.java
@@ -7,6 +7,7 @@
 import redis.clients.jedis.HostAndPort;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.HostAndPorts;
+import redis.clients.jedis.util.RedisProtocolUtil;
 
 public abstract class JedisCommandsTestBase {
 
@@ -20,8 +21,10 @@ public JedisCommandsTestBase() {
 
   @Before
   public void setUp() throws Exception {
-    //jedis = new Jedis(hnp, DefaultJedisClientConfig.builder().timeoutMillis(500).password("foobared").build());
-    jedis = new Jedis(hnp, DefaultJedisClientConfig.builder().resp3().timeoutMillis(500).password("foobared").build());
+//    jedis = new Jedis(hnp, DefaultJedisClientConfig.builder().timeoutMillis(500).password("foobared").build());
+    jedis = new Jedis(hnp, DefaultJedisClientConfig.builder()
+        .protocol(RedisProtocolUtil.getRedisProtocol())
+        .timeoutMillis(500).password("foobared").build());
     jedis.flushAll();
   }
 
@@ -31,6 +34,9 @@ public void tearDown() throws Exception {
   }
 
   protected Jedis createJedis() {
-    return new Jedis(hnp, DefaultJedisClientConfig.builder().password("foobared").build());
+//    return new Jedis(hnp, DefaultJedisClientConfig.builder().password("foobared").build());
+    return new Jedis(hnp, DefaultJedisClientConfig.builder()
+        .protocol(RedisProtocolUtil.getRedisProtocol())
+        .password("foobared").build());
   }
 }
diff --git a/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledCommandsTestHelper.java b/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledCommandsTestHelper.java
@@ -5,6 +5,7 @@
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPooled;
 import redis.clients.jedis.HostAndPorts;
+import redis.clients.jedis.util.RedisProtocolUtil;
 
 public class PooledCommandsTestHelper {
 
@@ -19,7 +20,8 @@ static JedisPooled getPooled() throws InterruptedException {
     node.flushAll();
 
     //return new JedisPooled(nodeInfo.getHost(), nodeInfo.getPort(), null, "foobared");
-    return new JedisPooled(nodeInfo, DefaultJedisClientConfig.builder().resp3().password("foobared").build());
+    return new JedisPooled(nodeInfo, DefaultJedisClientConfig.builder()
+        .protocol(RedisProtocolUtil.getRedisProtocol()).password("foobared").build());
   }
 
   static void clearData() {
diff --git a/src/test/java/redis/clients/jedis/modules/RedisModuleCommandsTestBase.java b/src/test/java/redis/clients/jedis/modules/RedisModuleCommandsTestBase.java
@@ -12,6 +12,7 @@
 import redis.clients.jedis.Protocol;
 import redis.clients.jedis.UnifiedJedis;
 import redis.clients.jedis.exceptions.JedisConnectionException;
+import redis.clients.jedis.util.RedisProtocolUtil;
 
 public abstract class RedisModuleCommandsTestBase {
 
@@ -38,7 +39,8 @@ public void setUp() {
     try (Jedis jedis = new Jedis(hnp)) {
       jedis.flushAll();
     }
-    client = new UnifiedJedis(hnp, DefaultJedisClientConfig.builder().resp3().build());
+    client = new UnifiedJedis(hnp, DefaultJedisClientConfig.builder()
+        .protocol(RedisProtocolUtil.getRedisProtocol()).build());
   }
 
   @After
@@ -49,8 +51,8 @@ public void tearDown() throws Exception {
 //  public static void tearDown() {
 //    client.close();
 //  }
-
-  protected static Connection createConnection() {
-    return new Connection(hnp);
-  }
+//
+//  protected static Connection createConnection() {
+//    return new Connection(hnp);
+//  }
 }
diff --git a/src/test/java/redis/clients/jedis/modules/RedisModulesPipelineTest.java b/src/test/java/redis/clients/jedis/modules/RedisModulesPipelineTest.java
@@ -17,7 +17,6 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import redis.clients.jedis.Connection;
 import redis.clients.jedis.Pipeline;
 import redis.clients.jedis.Response;
 import redis.clients.jedis.json.JsonSetParams;
@@ -44,8 +43,9 @@ public void search() {
     fields.put("title", "hello world");
     fields.put("body", "lorem ipsum");
 
-    Connection c = createConnection();
-    Pipeline p = new Pipeline(c);
+//    Connection c = createConnection();
+//    Pipeline p = new Pipeline(c);
+    Pipeline p = (Pipeline) client.pipelined();
 
     Response<String> create = p.ftCreate(index, IndexOptions.defaultOptions(), sc);
     Response<String> alter = p.ftAlter(index, new Schema().addTextField("foo", 1.0));
@@ -65,7 +65,7 @@ public void search() {
     Response<Map<String, List<String>>> synDump = p.ftSynDump(index);
 
     p.sync();
-    c.close();
+//    c.close();
 
     assertEquals("OK", create.get());
     assertEquals("OK", alter.get());
@@ -101,8 +101,9 @@ public void jsonV1() {
     Baz baz2 = new Baz("quuz2", "grault2", "waldo2");
     Baz baz3 = new Baz("quuz3", "grault3", "waldo3");
 
-    Connection c = createConnection();
-    Pipeline p = new Pipeline(c);
+//    Connection c = createConnection();
+//    Pipeline p = new Pipeline(c);
+    Pipeline p = (Pipeline) client.pipelined();
 
     Response<String> set1 = p.jsonSet("foo", Path.ROOT_PATH, hm1);
     Response<Object> get = p.jsonGet("foo");
@@ -142,7 +143,7 @@ public void jsonV1() {
     Response<Baz> popClassWithIndex = p.jsonArrPop("baz", Baz.class, Path.ROOT_PATH, 0);
 
     p.sync();
-    c.close();
+//    c.close();
 
     assertEquals("OK", set1.get());
     assertEquals(hm1, get.get());
@@ -190,8 +191,9 @@ public void jsonV2() {
     hm2.put("boolean", true);
     hm2.put("number", 3);
 
-    Connection c = createConnection();
-    Pipeline p = new Pipeline(c);
+//    Connection c = createConnection();
+//    Pipeline p = new Pipeline(c);
+    Pipeline p = (Pipeline) client.pipelined();
 
     Response<String> setWithEscape = p.jsonSetWithEscape("foo", Path2.ROOT_PATH, hm1);
     Response<Object> get = p.jsonGet("foo",  Path2.ROOT_PATH);
@@ -217,7 +219,7 @@ public void jsonV2() {
     Response<Long> clear = p.jsonClear("foo", new Path2("array"));
 
     p.sync();
-    c.close();
+//    c.close();
 
     assertEquals("OK", setWithEscape.get());
     assertNotNull(get.get());
diff --git a/src/test/java/redis/clients/jedis/modules/graph/GraphPipelineTest.java b/src/test/java/redis/clients/jedis/modules/graph/GraphPipelineTest.java
@@ -25,7 +25,7 @@
 
 public class GraphPipelineTest extends RedisModuleCommandsTestBase {
 
-  private Connection c;
+//  private Connection c;
 
   @BeforeClass
   public static void prepare() {
@@ -42,20 +42,21 @@ public static void prepare() {
 //    api.deleteGraph("social");
 //    api.close();
 //  }
-
-  @Before
-  public void createApi() {
-    c = createConnection();
-  }
-
-  @After
-  public void deleteGraph() {
-    c.close();
-  }
+//
+//  @Before
+//  public void createApi() {
+//    c = createConnection();
+//  }
+//
+//  @After
+//  public void deleteGraph() {
+//    c.close();
+//  }
 
   @Test
   public void testSync() {
-    Pipeline pipeline = new Pipeline(c);
+//    Pipeline pipeline = new Pipeline(c);
+    Pipeline pipeline = (Pipeline) client.pipelined();
 
     pipeline.set("x", "1");
     pipeline.graphQuery("social", "CREATE (:Person {name:'a'})");
@@ -140,7 +141,8 @@ record = iterator.next();
 
   @Test
   public void testReadOnlyQueries() {
-    Pipeline pipeline = new Pipeline(c);
+//    Pipeline pipeline = new Pipeline(c);
+    Pipeline pipeline = (Pipeline) client.pipelined();
 
     pipeline.set("x", "1");
     pipeline.graphQuery("social", "CREATE (:Person {name:'a'})");
@@ -215,7 +217,8 @@ record = iterator.next();
 
   @Test
   public void testWaitReplicas() {
-    Pipeline pipeline = new Pipeline(c);
+//    Pipeline pipeline = new Pipeline(c);
+    Pipeline pipeline = (Pipeline) client.pipelined();
     pipeline.set("x", "1");
     pipeline.graphProfile("social", "CREATE (:Person {name:'a'})");
     pipeline.graphProfile("g", "CREATE (:Person {name:'a'})");
@@ -227,7 +230,8 @@ public void testWaitReplicas() {
   @Test
   @org.junit.Ignore
   public void testWaitAof() {
-    Pipeline pipeline = new Pipeline(c);
+//    Pipeline pipeline = new Pipeline(c);
+    Pipeline pipeline = (Pipeline) client.pipelined();
     pipeline.set("x", "1");
     pipeline.graphProfile("social", "CREATE (:Person {name:'a'})");
     pipeline.graphProfile("g", "CREATE (:Person {name:'a'})");
diff --git a/src/test/java/redis/clients/jedis/modules/graph/GraphTransactionTest.java b/src/test/java/redis/clients/jedis/modules/graph/GraphTransactionTest.java
@@ -9,12 +9,9 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.junit.After;
-import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import redis.clients.jedis.Connection;
 import redis.clients.jedis.Transaction;
 import redis.clients.jedis.graph.Header;
 import redis.clients.jedis.graph.Record;
@@ -25,7 +22,7 @@
 
 public class GraphTransactionTest extends RedisModuleCommandsTestBase {
 
-  private Connection c;
+//  private Connection c;
 
   @BeforeClass
   public static void prepare() {
@@ -42,20 +39,21 @@ public static void prepare() {
 //    api.deleteGraph("social");
 //    api.close();
 //  }
-
-  @Before
-  public void createApi() {
-    c = createConnection();
-  }
-
-  @After
-  public void deleteGraph() {
-    c.close();
-  }
+//
+//  @Before
+//  public void createApi() {
+//    c = createConnection();
+//  }
+//
+//  @After
+//  public void deleteGraph() {
+//    c.close();
+//  }
 
   @Test
   public void testMultiExec() {
-    Transaction transaction = new Transaction(c);
+//    Transaction transaction = new Transaction(c);
+    Transaction transaction = client.multi();
 
     transaction.set("x", "1");
     transaction.graphQuery("social", "CREATE (:Person {name:'a'})");
@@ -178,7 +176,8 @@ record = iterator.next();
 
   @Test
   public void testMultiExecWithReadOnlyQueries() {
-    Transaction transaction = new Transaction(c);
+//    Transaction transaction = new Transaction(c);
+    Transaction transaction = client.multi();
 
     transaction.set("x", "1");
     transaction.graphQuery("social", "CREATE (:Person {name:'a'})");
diff --git a/src/test/java/redis/clients/jedis/util/RedisProtocolUtil.java b/src/test/java/redis/clients/jedis/util/RedisProtocolUtil.java
@@ -0,0 +1,19 @@
+package redis.clients.jedis.util;
+
+import redis.clients.jedis.RedisProtocol;
+
+public class RedisProtocolUtil {
+  
+  public static RedisProtocol getRedisProtocol() {
+    String ver = System.getProperty("jedisProtocol");
+    if (ver != null && !ver.isEmpty()) {
+      for (RedisProtocol proto : RedisProtocol.values()) {
+        if (proto.version().equals(ver)) {
+          return proto;
+        }
+      }
+      throw new IllegalArgumentException("Unknown protocol " + ver);
+    }
+    return null;
+  }
+}
