Fix assertEqualsDeep(Set, Set, String) wrong comparison and add variant without message

CHANGES.txt

@@ -2,6 +2,7 @@ Current (7.11.0)
 Fixed: GITHUB-3028: Execution stalls when using "use-global-thread-pool" (Krishnan Mahadevan)
 Fixed: GITHUB-3122: Update JCommander to 1.83 (Antoine Dessaigne)
 Fixed: GITHUB-3135: assertEquals on arrays - Failure message is missing information about the array index when an array element is unexpectedly null or non-null (Albert Choi)
+Fixed: GITHUB-3140: assertEqualsDeep on Sets - Deep comparison was using the wrong expected value
 
 7.10.2
 Fixed: GITHUB-3117: ListenerComparator doesn't work (Krishnan Mahadevan)

testng-asserts/src/main/java/org/testng/Assert.java

@@ -2067,14 +2067,18 @@ private static String getNotEqualDeepReason(Set<?> actual, Set<?> expected) {
           return arrayNotEqualReason;
         }
       } else {
-        if (!areEqualImpl(value, expected)) {
+        if (!areEqualImpl(value, expectedValue)) {
           return "Sets not equal: expected: " + expectedValue + " and actual: " + value;
         }
       }
     }
     return null;
   }
 
+  public static void assertEqualsDeep(Set<?> actual, Set<?> expected) {
+    assertEqualsDeep(actual, expected, null);
+  }
+
   public static void assertEqualsDeep(Set<?> actual, Set<?> expected, String message) {
     String notEqualDeepReason = getNotEqualDeepReason(actual, expected);
     if (notEqualDeepReason != null) {

testng-asserts/src/test/java/org/testng/AssertTest.java

@@ -580,6 +580,28 @@ public void testAssertNotEqualsWithNull() {
     Assert.assertNotEquals(obj, obj);
   }
 
+  @Test(description = "GITHUB-3140")
+  public void testAssertEqualsDeepSet() {
+    var expectedSet = new HashSet<>();
+    expectedSet.add(new Contrived(1));
+    expectedSet.add(new Contrived[] {new Contrived(1)});
+    var actualSet = new HashSet<>();
+    actualSet.add(new Contrived(1));
+    actualSet.add(new Contrived[] {new Contrived(1)});
+    Assert.assertEqualsDeep(actualSet, expectedSet);
+  }
+
+  @Test(description = "GITHUB-3140", expectedExceptions = AssertionError.class)
+  public void testAssertEqualsDeepSetFail() {
+    var expectedSet = new HashSet<>();
+    expectedSet.add(new Contrived(1));
+    expectedSet.add(new Contrived[] {new Contrived(1)});
+    var actualSet = new HashSet<>();
+    actualSet.add(new Contrived(1));
+    actualSet.add(new Contrived[] {new Contrived(2)});
+    Assert.assertEqualsDeep(actualSet, expectedSet);
+  }
+
   static class Contrived {
 
     int integer;