Merge pull request #4 from valkey-io/fix-3

to #3, fix the scan test error

Author: yangbodong22011

src/test/java/io/valkey/commands/jedis/AllKindOfValuesCommandsTest.java

@@ -812,12 +812,8 @@ public void scanType() {
     ScanResult<String> scanResult;
 
     scanResult = jedis.scan(ScanParams.SCAN_POINTER_START, pagingParams, "string");
-    assertFalse(scanResult.isCompleteIteration());
-    int page1Count = scanResult.getResult().size();
-    scanResult = jedis.scan(scanResult.getCursor(), pagingParams, "string");
-    assertTrue(scanResult.isCompleteIteration());
-    int page2Count = scanResult.getResult().size();
-    assertEquals(4, page1Count + page2Count);
+    assertTrue(scanResult.isCompleteIteration()); // https://github.com/valkey-io/valkey/issues/1490
+    assertEquals(4, scanResult.getResult().size());
 
 
     scanResult = jedis.scan(ScanParams.SCAN_POINTER_START, noParams, "hash");
@@ -844,12 +840,8 @@ public void scanType() {
     jedis.set("g", "g");
 
     binaryResult = jedis.scan(ScanParams.SCAN_POINTER_START_BINARY, pagingParams, string);
-    assertFalse(binaryResult.isCompleteIteration());
-    page1Count = binaryResult.getResult().size();
-    binaryResult = jedis.scan(binaryResult.getCursorAsBytes(), pagingParams, string);
     assertTrue(binaryResult.isCompleteIteration());
-    page2Count = binaryResult.getResult().size();
-    assertEquals(4, page1Count + page2Count);
+    assertEquals(4, binaryResult.getResult().size());
 
     binaryResult = jedis.scan(ScanParams.SCAN_POINTER_START_BINARY, noParams, hash);
     AssertUtil.assertByteArrayListEquals(Collections.singletonList(new byte[]{98}), binaryResult.getResult());

src/test/java/io/valkey/commands/jedis/ControlCommandsTest.java

@@ -2,6 +2,7 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -427,7 +428,7 @@ public void memoryUsageBinary() {
     assertThat(jedis.memoryUsage(bfoo), greaterThan(20l));
 
     jedis.lpush(bfoobar, new byte[]{0x01, 0x02}, new byte[]{0x05, 0x06}, new byte[]{0x00});
-    assertThat(jedis.memoryUsage(bfoobar, 2), greaterThan(40l));
+    assertThat(jedis.memoryUsage(bfoobar, 2), greaterThanOrEqualTo(40l));
 
     assertNull(jedis.memoryUsage("roo", 2));
   }

src/test/java/io/valkey/commands/unified/AllKindOfValuesCommandsTestBase.java

@@ -626,12 +626,8 @@ public void scanType() {
     ScanResult<String> scanResult;
 
     scanResult = jedis.scan(ScanParams.SCAN_POINTER_START, pagingParams, "string");
-    assertFalse(scanResult.isCompleteIteration());
-    int page1Count = scanResult.getResult().size();
-    scanResult = jedis.scan(scanResult.getCursor(), pagingParams, "string");
-    assertTrue(scanResult.isCompleteIteration());
-    int page2Count = scanResult.getResult().size();
-    assertEquals(4, page1Count + page2Count);
+    assertTrue(scanResult.isCompleteIteration()); // https://github.com/valkey-io/valkey/issues/1490
+    assertEquals(4, scanResult.getResult().size());
 
 
     scanResult = jedis.scan(ScanParams.SCAN_POINTER_START, noParams, "hash");
@@ -658,12 +654,8 @@ public void scanType() {
     jedis.set("g", "g");
 
     binaryResult = jedis.scan(ScanParams.SCAN_POINTER_START_BINARY, pagingParams, string);
-    assertFalse(binaryResult.isCompleteIteration());
-    page1Count = binaryResult.getResult().size();
-    binaryResult = jedis.scan(binaryResult.getCursorAsBytes(), pagingParams, string);
     assertTrue(binaryResult.isCompleteIteration());
-    page2Count = binaryResult.getResult().size();
-    assertEquals(4, page1Count + page2Count);
+    assertEquals(4, binaryResult.getResult().size());
 
     binaryResult = jedis.scan(ScanParams.SCAN_POINTER_START_BINARY, noParams, hash);
     AssertUtil.assertByteArrayListEquals(Collections.singletonList(new byte[]{98}), binaryResult.getResult());

src/test/java/io/valkey/commands/unified/cluster/ClusterAllKindOfValuesCommandsTest.java

@@ -224,12 +224,8 @@ public void scanType() {
     ScanResult<String> scanResult;
 
     scanResult = jedis.scan(ScanParams.SCAN_POINTER_START, pagingParams, "string");
-    assertFalse(scanResult.isCompleteIteration());
-    int page1Count = scanResult.getResult().size();
-    scanResult = jedis.scan(scanResult.getCursor(), pagingParams, "string");
-    assertTrue(scanResult.isCompleteIteration());
-    int page2Count = scanResult.getResult().size();
-    assertEquals(4, page1Count + page2Count);
+    assertTrue(scanResult.isCompleteIteration()); // https://github.com/valkey-io/valkey/issues/1490
+    assertEquals(4, scanResult.getResult().size());
 
 
     scanResult = jedis.scan(ScanParams.SCAN_POINTER_START, noCount, "hash");