Added better error info for set comparison failures

Bit-Quill · Jun 28, 2024 · 4819dad · 4819dad
1 parent 6cc4f2f
commit 4819dad
Showing 1 changed file with 29 additions and 13 deletions.
diff --git a/java/integTest/src/test/java/glide/SharedCommandTests.java b/java/integTest/src/test/java/glide/SharedCommandTests.java
@@ -7048,8 +7048,9 @@ public void sscan(BaseClient client) {
         assertEquals(charMembers.length, ((Object[]) result[resultCollectionIndex]).length);
         final Set<Object> resultMembers =
                 Arrays.stream((Object[]) result[resultCollectionIndex]).collect(Collectors.toSet());
-        assertTrue(resultMembers.containsAll(charMemberSet),
-            String.format("resultMembers: {%s}, charMemberSet: {%s}", resultMembers, charMemberSet));
+        assertTrue(
+                resultMembers.containsAll(charMemberSet),
+                String.format("resultMembers: {%s}, charMemberSet: {%s}", resultMembers, charMemberSet));
 
         result =
                 client.sscan(key1, initialCursor, SScanOptions.builder().matchPattern("a").build()).get();
@@ -7078,8 +7079,11 @@ public void sscan(BaseClient client) {
                             .collect(Collectors.toSet()));
         } while (resultCursor != 0); // 0 is returned for the cursor of the last iteration.
 
-        assertTrue(secondResultValues.containsAll(numberMembersSet),
-            String.format("secondResultValues: {%s}, numberMembersSet: {%s}", secondResultValues, numberMembersSet));
+        assertTrue(
+                secondResultValues.containsAll(numberMembersSet),
+                String.format(
+                        "secondResultValues: {%s}, numberMembersSet: {%s}",
+                        secondResultValues, numberMembersSet));
 
         // Test match pattern
         result =
@@ -7176,14 +7180,21 @@ public void zscan(BaseClient client) {
             resultKeys.add(resultArray[i]);
             resultValues.add(resultArray[i + 1]);
         }
-        assertTrue(resultKeys.containsAll(charMap.keySet()));
+        assertTrue(
+                resultKeys.containsAll(charMap.keySet()),
+                String.format("resultKeys: {%s} charMap.keySet(): {%s}", resultKeys, charMap.keySet()));
 
         // The score comes back as an integer converted to a String when the fraction is zero.
+        final Set<String> expectedScoresAsStrings =
+                charMap.values().stream()
+                        .map(v -> String.valueOf(v.intValue()))
+                        .collect(Collectors.toSet());
+
         assertTrue(
-                resultValues.containsAll(
-                        charMap.values().stream()
-                                .map(v -> String.valueOf(v.intValue()))
-                                .collect(Collectors.toSet())));
+                resultValues.containsAll(expectedScoresAsStrings),
+                String.format(
+                        "resultValues: {%s} expectedScoresAsStrings: {%s}",
+                        resultValues, expectedScoresAsStrings));
 
         result =
                 client.zscan(key1, initialCursor, ZScanOptions.builder().matchPattern("a").build()).get();
@@ -7217,11 +7228,16 @@ public void zscan(BaseClient client) {
         } while (resultCursor != 0); // 0 is returned for the cursor of the last iteration.
 
         assertTrue(secondResultAllKeys.containsAll(numberMap.keySet()));
+        final Set<String> numberMapValuesAsStrings =
+                numberMap.values().stream()
+                        .map(d -> String.valueOf(d.intValue()))
+                        .collect(Collectors.toSet());
+
         assertTrue(
-                secondResultAllValues.containsAll(
-                        numberMap.values().stream()
-                                .map(d -> String.valueOf(d.intValue()))
-                                .collect(Collectors.toSet())));
+                secondResultAllValues.containsAll(numberMapValuesAsStrings),
+                String.format(
+                        "secondResultAllValues: {%s} numberMapValuesAsStrings: {%s}",
+                        secondResultAllValues, numberMapValuesAsStrings));
 
         // Test match pattern
         result =