Skip to content

Commit

Permalink
Fix rebase errors
Browse files Browse the repository at this point in the history
  • Loading branch information
jduo committed Jun 29, 2024
1 parent a2d853c commit 5c26630
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 18 deletions.
17 changes: 0 additions & 17 deletions java/integTest/src/test/java/glide/SharedCommandTests.java
Original file line number Diff line number Diff line change
Expand Up @@ -7266,23 +7266,6 @@ public void zscan(BaseClient client) {
}
} while (!resultCursor.equals("0")); // 0 is returned for the cursor of the last iteration.

assertTrue(
secondResultAllKeys.containsAll(numberMap.keySet()),
String.format(
"secondResultAllKeys: {%s} numberMap.keySet: {%s}",
secondResultAllKeys, numberMap.keySet()));

final Set<String> numberMapValuesAsStrings =
numberMap.values().stream()
.map(d -> String.valueOf(d.intValue()))
.collect(Collectors.toSet());

assertTrue(
secondResultAllValues.containsAll(numberMapValuesAsStrings),
String.format(
"secondResultAllValues: {%s} numberMapValuesAsStrings: {%s}",
secondResultAllValues, numberMapValuesAsStrings));

assertTrue(
secondResultAllKeys.containsAll(numberMap.keySet()),
String.format(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,6 @@ private static Object[] setCommands(BaseTransaction<?> transaction) {

transaction
.sadd(setKey1, new String[] {"baz", "foo"})

.srem(setKey1, new String[] {"foo"})
.sscan(setKey1, "0")
.sscan(setKey1, "0", SScanOptions.builder().matchPattern("*").count(10L).build())
Expand Down

0 comments on commit 5c26630

Please sign in to comment.