resolve conflicts

Signed-off-by: prashanna-frsh <prashanna.rajendran@freshworks.com>

Author: prashanna-frsh

java/jedis-compatibility/src/test/java/redis/clients/jedis/JedisMethodsTest.java

@@ -292,222 +292,56 @@ public void testFunctionListMethodSignatures() throws NoSuchMethodException {
     public void testSetMethodSignatures() throws NoSuchMethodException {
         Class<Jedis> jedisClass = Jedis.class;
 
-        Method saddString = jedisClass.getMethod("sadd", String.class, String[].class);
-        assertEquals(long.class, saddString.getReturnType());
+        Method aclList = jedisClass.getMethod("aclList");
+        assertEquals(List.class, aclList.getReturnType());
 
-        Method saddBinary = jedisClass.getMethod("sadd", byte[].class, byte[][].class);
-        assertEquals(long.class, saddBinary.getReturnType());
+        Method aclGetUser = jedisClass.getMethod("aclGetUser", String.class);
+        assertEquals(AccessControlUser.class, aclGetUser.getReturnType());
 
-        Method sremString = jedisClass.getMethod("srem", String.class, String[].class);
-        assertEquals(long.class, sremString.getReturnType());
+        Method aclSetUserNoRules = jedisClass.getMethod("aclSetUser", String.class);
+        assertEquals(String.class, aclSetUserNoRules.getReturnType());
 
-        Method sremBinary = jedisClass.getMethod("srem", byte[].class, byte[][].class);
-        assertEquals(long.class, sremBinary.getReturnType());
+        Method aclSetUserWithRules = jedisClass.getMethod("aclSetUser", String.class, String[].class);
+        assertEquals(String.class, aclSetUserWithRules.getReturnType());
 
-        Method smembersString = jedisClass.getMethod("smembers", String.class);
-        assertEquals(Set.class, smembersString.getReturnType());
+        Method aclDelUser = jedisClass.getMethod("aclDelUser", String[].class);
+        assertEquals(long.class, aclDelUser.getReturnType());
 
-        Method smembersBinary = jedisClass.getMethod("smembers", byte[].class);
-        assertEquals(Set.class, smembersBinary.getReturnType());
-    }
-
-    @Test
-    public void saddStringSignatureAndReturnType() throws NoSuchMethodException {
-        Method m = Jedis.class.getMethod("sadd", String.class, String[].class);
-        assertEquals(long.class, m.getReturnType());
-        assertEquals(2, m.getParameterCount());
-        assertEquals(String.class, m.getParameterTypes()[0]);
-        assertEquals(String[].class, m.getParameterTypes()[1]);
-    }
-
-    @Test
-    public void saddBinarySignatureAndReturnType() throws NoSuchMethodException {
-        Method m = Jedis.class.getMethod("sadd", byte[].class, byte[][].class);
-        assertEquals(long.class, m.getReturnType());
-        assertEquals(2, m.getParameterCount());
-        assertEquals(byte[].class, m.getParameterTypes()[0]);
-        assertEquals(byte[][].class, m.getParameterTypes()[1]);
-    }
-
-    @Test
-    public void sremStringSignatureAndReturnType() throws NoSuchMethodException {
-        Method m = Jedis.class.getMethod("srem", String.class, String[].class);
-        assertEquals(long.class, m.getReturnType());
-        assertEquals(2, m.getParameterCount());
-        assertEquals(String.class, m.getParameterTypes()[0]);
-        assertEquals(String[].class, m.getParameterTypes()[1]);
-    }
-
-    @Test
-    public void sremBinarySignatureAndReturnType() throws NoSuchMethodException {
-        Method m = Jedis.class.getMethod("srem", byte[].class, byte[][].class);
-        assertEquals(long.class, m.getReturnType());
-        assertEquals(2, m.getParameterCount());
-        assertEquals(byte[].class, m.getParameterTypes()[0]);
-        assertEquals(byte[][].class, m.getParameterTypes()[1]);
-    }
-
-    @Test
-    public void smembersStringSignatureAndReturnType() throws NoSuchMethodException {
-        Method m = Jedis.class.getMethod("smembers", String.class);
-        assertEquals(Set.class, m.getReturnType());
-        assertEquals(1, m.getParameterCount());
-        assertEquals(String.class, m.getParameterTypes()[0]);
-    }
-
-    @Test
-    public void smembersBinarySignatureAndReturnType() throws NoSuchMethodException {
-        Method m = Jedis.class.getMethod("smembers", byte[].class);
-        assertEquals(Set.class, m.getReturnType());
-        assertEquals(1, m.getParameterCount());
-        assertEquals(byte[].class, m.getParameterTypes()[0]);
-    }
-
-    @Test
-    public void scardMethodsExist() throws NoSuchMethodException {
-        assertNotNull(Jedis.class.getMethod("scard", String.class));
-        assertNotNull(Jedis.class.getMethod("scard", byte[].class));
-        assertEquals(long.class, Jedis.class.getMethod("scard", String.class).getReturnType());
-        assertEquals(long.class, Jedis.class.getMethod("scard", byte[].class).getReturnType());
-    }
-
-    @Test
-    public void sismemberMethodsExist() throws NoSuchMethodException {
-        assertNotNull(Jedis.class.getMethod("sismember", String.class, String.class));
-        assertNotNull(Jedis.class.getMethod("sismember", byte[].class, byte[].class));
-        assertEquals(
-                boolean.class,
-                Jedis.class.getMethod("sismember", String.class, String.class).getReturnType());
-        assertEquals(
-                boolean.class,
-                Jedis.class.getMethod("sismember", byte[].class, byte[].class).getReturnType());
-    }
-
-    @Test
-    public void smismemberMethodsExist() throws NoSuchMethodException {
-        assertNotNull(Jedis.class.getMethod("smismember", String.class, String[].class));
-        assertNotNull(Jedis.class.getMethod("smismember", byte[].class, byte[][].class));
-        assertEquals(
-                java.util.List.class,
-                Jedis.class.getMethod("smismember", String.class, String[].class).getReturnType());
-        assertEquals(
-                java.util.List.class,
-                Jedis.class.getMethod("smismember", byte[].class, byte[][].class).getReturnType());
-    }
+        Method aclCatNoArg = jedisClass.getMethod("aclCat");
+        assertEquals(List.class, aclCatNoArg.getReturnType());
 
-    @Test
-    public void spopMethodsExist() throws NoSuchMethodException {
-        assertNotNull(Jedis.class.getMethod("spop", String.class));
-        assertNotNull(Jedis.class.getMethod("spop", byte[].class));
-        assertNotNull(Jedis.class.getMethod("spop", String.class, long.class));
-        assertNotNull(Jedis.class.getMethod("spop", byte[].class, long.class));
-    }
+        Method aclCatCategory = jedisClass.getMethod("aclCat", String.class);
+        assertEquals(List.class, aclCatCategory.getReturnType());
 
-    @Test
-    public void srandmemberMethodsExist() throws NoSuchMethodException {
-        assertNotNull(Jedis.class.getMethod("srandmember", String.class));
-        assertNotNull(Jedis.class.getMethod("srandmember", byte[].class));
-        assertNotNull(Jedis.class.getMethod("srandmember", String.class, int.class));
-        assertNotNull(Jedis.class.getMethod("srandmember", byte[].class, int.class));
-    }
+        Method aclGenPassNoArg = jedisClass.getMethod("aclGenPass");
+        assertEquals(String.class, aclGenPassNoArg.getReturnType());
 
-    @Test
-    public void smoveMethodsExist() throws NoSuchMethodException {
-        assertNotNull(Jedis.class.getMethod("smove", String.class, String.class, String.class));
-        assertNotNull(Jedis.class.getMethod("smove", byte[].class, byte[].class, byte[].class));
-        assertEquals(
-                long.class,
-                Jedis.class.getMethod("smove", String.class, String.class, String.class).getReturnType());
-        assertEquals(
-                long.class,
-                Jedis.class.getMethod("smove", byte[].class, byte[].class, byte[].class).getReturnType());
-    }
+        Method aclGenPassBits = jedisClass.getMethod("aclGenPass", int.class);
+        assertEquals(String.class, aclGenPassBits.getReturnType());
 
-    @Test
-    public void sinterMethodsExist() throws NoSuchMethodException {
-        assertNotNull(Jedis.class.getMethod("sinter", String[].class));
-        assertNotNull(Jedis.class.getMethod("sinter", byte[][].class));
-        assertEquals(Set.class, Jedis.class.getMethod("sinter", String[].class).getReturnType());
-        assertEquals(Set.class, Jedis.class.getMethod("sinter", byte[][].class).getReturnType());
-    }
+        Method aclLogNoArg = jedisClass.getMethod("aclLog");
+        assertEquals(List.class, aclLogNoArg.getReturnType());
 
-    @Test
-    public void sunionMethodsExist() throws NoSuchMethodException {
-        assertNotNull(Jedis.class.getMethod("sunion", String[].class));
-        assertNotNull(Jedis.class.getMethod("sunion", byte[][].class));
-        assertEquals(Set.class, Jedis.class.getMethod("sunion", String[].class).getReturnType());
-        assertEquals(Set.class, Jedis.class.getMethod("sunion", byte[][].class).getReturnType());
-    }
+        Method aclLogCount = jedisClass.getMethod("aclLog", int.class);
+        assertEquals(List.class, aclLogCount.getReturnType());
 
-    @Test
-    public void sdiffMethodsExist() throws NoSuchMethodException {
-        assertNotNull(Jedis.class.getMethod("sdiff", String[].class));
-        assertNotNull(Jedis.class.getMethod("sdiff", byte[][].class));
-        assertEquals(Set.class, Jedis.class.getMethod("sdiff", String[].class).getReturnType());
-        assertEquals(Set.class, Jedis.class.getMethod("sdiff", byte[][].class).getReturnType());
-    }
+        Method aclLogReset = jedisClass.getMethod("aclLogReset");
+        assertEquals(String.class, aclLogReset.getReturnType());
 
-    @Test
-    public void sintercardMethodsExist() throws NoSuchMethodException {
-        assertNotNull(Jedis.class.getMethod("sintercard", String[].class));
-        assertNotNull(Jedis.class.getMethod("sintercard", long.class, String[].class));
-        assertNotNull(Jedis.class.getMethod("sintercard", byte[][].class));
-        assertNotNull(Jedis.class.getMethod("sintercard", long.class, byte[][].class));
-        assertEquals(long.class, Jedis.class.getMethod("sintercard", String[].class).getReturnType());
-        assertEquals(
-                long.class,
-                Jedis.class.getMethod("sintercard", long.class, String[].class).getReturnType());
-        assertEquals(long.class, Jedis.class.getMethod("sintercard", byte[][].class).getReturnType());
-        assertEquals(
-                long.class,
-                Jedis.class.getMethod("sintercard", long.class, byte[][].class).getReturnType());
-    }
+        Method aclWhoAmI = jedisClass.getMethod("aclWhoAmI");
+        assertEquals(String.class, aclWhoAmI.getReturnType());
 
-    @Test
-    public void sinterstoreMethodsExist() throws NoSuchMethodException {
-        assertNotNull(Jedis.class.getMethod("sinterstore", String.class, String[].class));
-        assertNotNull(Jedis.class.getMethod("sinterstore", byte[].class, byte[][].class));
-        assertEquals(
-                long.class,
-                Jedis.class.getMethod("sinterstore", String.class, String[].class).getReturnType());
-        assertEquals(
-                long.class,
-                Jedis.class.getMethod("sinterstore", byte[].class, byte[][].class).getReturnType());
-    }
+        Method aclUsers = jedisClass.getMethod("aclUsers");
+        assertEquals(List.class, aclUsers.getReturnType());
 
-    @Test
-    public void sunionstoreMethodsExist() throws NoSuchMethodException {
-        assertNotNull(Jedis.class.getMethod("sunionstore", String.class, String[].class));
-        assertNotNull(Jedis.class.getMethod("sunionstore", byte[].class, byte[][].class));
-        assertEquals(
-                long.class,
-                Jedis.class.getMethod("sunionstore", String.class, String[].class).getReturnType());
-        assertEquals(
-                long.class,
-                Jedis.class.getMethod("sunionstore", byte[].class, byte[][].class).getReturnType());
-    }
+        Method aclSave = jedisClass.getMethod("aclSave");
+        assertEquals(String.class, aclSave.getReturnType());
 
-    @Test
-    public void sdiffstoreMethodsExist() throws NoSuchMethodException {
-        assertNotNull(Jedis.class.getMethod("sdiffstore", String.class, String[].class));
-        assertNotNull(Jedis.class.getMethod("sdiffstore", byte[].class, byte[][].class));
-        assertEquals(
-                long.class,
-                Jedis.class.getMethod("sdiffstore", String.class, String[].class).getReturnType());
-        assertEquals(
-                long.class,
-                Jedis.class.getMethod("sdiffstore", byte[].class, byte[][].class).getReturnType());
-    }
+        Method aclLoad = jedisClass.getMethod("aclLoad");
+        assertEquals(String.class, aclLoad.getReturnType());
 
-    @Test
-    public void sscanMethodsExist() throws NoSuchMethodException {
-        assertNotNull(Jedis.class.getMethod("sscan", String.class, String.class));
-        assertNotNull(
-                Jedis.class.getMethod(
-                        "sscan", String.class, String.class, redis.clients.jedis.params.ScanParams.class));
-        assertNotNull(Jedis.class.getMethod("sscan", byte[].class, byte[].class));
-        assertNotNull(
-                Jedis.class.getMethod(
-                        "sscan", byte[].class, byte[].class, redis.clients.jedis.params.ScanParams.class));
+        Method aclDryRun =
+                jedisClass.getMethod("aclDryRun", String.class, String.class, String[].class);
+        assertEquals(String.class, aclDryRun.getReturnType());
     }
 }