From 900d6eaf7876a05420743d4be7457dd00ba094c5 Mon Sep 17 00:00:00 2001
From: Picnic-DevPla-Bot <168541957+Picnic-DevPla-Bot@users.noreply.github.com>
Date: Mon, 17 Feb 2025 08:57:36 +0100
Subject: [PATCH] Upgrade TestNG 7.10.2 -> 7.11.0 (#1546)

See:
- https://github.com/testng-team/testng/releases/tag/7.11.0
- https://github.com/testng-team/testng/compare/7.10.2...7.11.0
---
 .../errorprone/refasterrules/TestNGToAssertJRules.java    | 8 ++++++++
 .../refasterrules/TestNGToAssertJRulesTestInput.java      | 3 +--
 .../refasterrules/TestNGToAssertJRulesTestOutput.java     | 3 +--
 pom.xml                                                   | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/TestNGToAssertJRules.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/TestNGToAssertJRules.java
index ea335d65..e3b2a0cd 100644
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/TestNGToAssertJRules.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/TestNGToAssertJRules.java
@@ -66,6 +66,7 @@ import tech.picnic.errorprone.refaster.annotation.TypeMigration;
        */
       "assertEqualsDeep(Map<?, ?>, Map<?, ?>)",
       "assertEqualsDeep(Map<?, ?>, Map<?, ?>, String)",
+      "assertEqualsDeep(Set<?>, Set<?>)",
       "assertEqualsDeep(Set<?>, Set<?>, String)",
       // XXX: Add migrations for the methods below.
       "assertEqualsNoOrder(Collection<?>, Collection<?>)",
@@ -299,6 +300,7 @@ final class TestNGToAssertJRules {
     }
   }
 
+  @SuppressWarnings("java:S1448" /* Each variant requires a separate `@BeforeTemplate` method. */)
   static final class AssertEqual {
     @BeforeTemplate
     void before(boolean actual, boolean expected) {
@@ -482,6 +484,7 @@ final class TestNGToAssertJRules {
     }
   }
 
+  @SuppressWarnings("java:S1448" /* Each variant requires a separate `@BeforeTemplate` method. */)
   static final class AssertEqualWithMessage {
     @BeforeTemplate
     void before(boolean actual, String message, boolean expected) {
@@ -588,6 +591,11 @@ final class TestNGToAssertJRules {
       assertEquals(actual, expected, message);
     }
 
+    @BeforeTemplate
+    void before(long actual, String message, Long expected) {
+      assertEquals(actual, expected, message);
+    }
+
     @BeforeTemplate
     void before(Long actual, String message, long expected) {
       assertEquals(actual, expected, message);
diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/TestNGToAssertJRulesTestInput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/TestNGToAssertJRulesTestInput.java
index 8ee347f9..79fc2850 100644
--- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/TestNGToAssertJRulesTestInput.java
+++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/TestNGToAssertJRulesTestInput.java
@@ -155,8 +155,7 @@ final class TestNGToAssertJRulesTest implements RefasterRuleCollectionTestCase {
     assertEquals(Integer.valueOf(0), 1, "corge");
     assertEquals(Integer.valueOf(0), Integer.valueOf(1), "grault");
     assertEquals(0L, 1L, "garply");
-    // XXX: Ambiguous method call, as the relevant overload is missing. See testng-team/testng#3199.
-    // assertEquals(0L, Long.valueOf(1), "waldo");
+    assertEquals(0L, Long.valueOf(1), "waldo");
     assertEquals(Long.valueOf(0), 1L, "fred");
     assertEquals(Long.valueOf(0), Long.valueOf(1), "plugh");
     assertEquals(0.0F, 1.0F, "xyzzy");
diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/TestNGToAssertJRulesTestOutput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/TestNGToAssertJRulesTestOutput.java
index 139caf08..da7539d0 100644
--- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/TestNGToAssertJRulesTestOutput.java
+++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/TestNGToAssertJRulesTestOutput.java
@@ -160,8 +160,7 @@ final class TestNGToAssertJRulesTest implements RefasterRuleCollectionTestCase {
     assertThat(Integer.valueOf(0)).withFailMessage("corge").isEqualTo(1);
     assertThat(Integer.valueOf(0)).withFailMessage("grault").isEqualTo(Integer.valueOf(1));
     assertThat(0L).withFailMessage("garply").isEqualTo(1L);
-    // XXX: Ambiguous method call, as the relevant overload is missing. See testng-team/testng#3199.
-    // assertEquals(0L, Long.valueOf(1), "waldo");
+    assertThat(0L).withFailMessage("waldo").isEqualTo(Long.valueOf(1));
     assertThat(Long.valueOf(0)).withFailMessage("fred").isEqualTo(1L);
     assertThat(Long.valueOf(0)).withFailMessage("plugh").isEqualTo(Long.valueOf(1));
     assertThat(0.0F).withFailMessage("xyzzy").isEqualTo(1.0F);
diff --git a/pom.xml b/pom.xml
index f268accd..65322949 100644
--- a/pom.xml
+++ b/pom.xml
@@ -529,7 +529,7 @@
             <dependency>
                 <groupId>org.testng</groupId>
                 <artifactId>testng</artifactId>
-                <version>7.10.2</version>
+                <version>7.11.0</version>
             </dependency>
         </dependencies>
     </dependencyManagement>