Fix errorprone issues

Author: juherr

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

@@ -308,19 +308,8 @@ public void compareUnEqualDoubleArraysWithDelta() {
   @SuppressWarnings("serial")
   @Test(expectedExceptions = AssertionError.class)
   public void assertEqualsMapShouldFail() {
-    Map<String, String> mapActual =
-        new HashMap<String, String>() {
-          {
-            put("a", "1");
-          }
-        };
-    Map<String, String> mapExpected =
-        new HashMap<String, String>() {
-          {
-            put("a", "1");
-            put("b", "2");
-          }
-        };
+    Map<String, String> mapActual = Map.of("a", "1");
+    Map<String, String> mapExpected = Map.of("a", "1", "b", "2");
 
     Assert.assertEquals(mapActual, mapExpected);
   }
@@ -654,12 +643,22 @@ static class BrokenEqualsTrue {
     public boolean equals(Object o) {
       return true; // broken implementation
     }
+
+    @Override
+    public int hashCode() {
+      return 1;
+    }
   }
 
   static class BrokenEqualsFalse {
     @Override
     public boolean equals(Object o) {
       return false; // broken implementation
     }
+
+    @Override
+    public int hashCode() {
+      return 1;
+    }
   }
 }

testng-asserts/src/test/java/test/asserttests/ArrayEqualityAssertTest.java

@@ -16,6 +16,7 @@
 import org.testng.annotations.Test;
 
 /** Tests different equality cases for nested collections and arrays. */
+@SuppressWarnings("ArraysAsListPrimitiveArray")
 public class ArrayEqualityAssertTest {
 
   @Test

testng-core/src/main/java/org/testng/SuiteResult.java

@@ -6,7 +6,7 @@
 import org.testng.xml.XmlSuite;
 
 /** This class logs the result of an entire Test Suite (defined by a property file). */
-class SuiteResult implements ISuiteResult, Comparable<ISuiteResult> {
+class SuiteResult implements ISuiteResult, Comparable<SuiteResult> {
   private final XmlSuite m_suite;
   private final ITestContext m_testContext;
 
@@ -26,7 +26,7 @@ public XmlSuite getSuite() {
   }
 
   @Override
-  public int compareTo(@Nonnull ISuiteResult other) {
+  public int compareTo(@Nonnull SuiteResult other) {
     int result = 0;
     try {
       String n1 = getTestContext().getName();

testng-core/src/main/java/org/testng/internal/ClonedMethod.java

@@ -139,7 +139,7 @@ public boolean hasMoreInvocation() {
 
   @Override
   public Class<?> getRealClass() {
-    return m_javaMethod.getClass();
+    return m_javaMethod.getDeclaringClass();
   }
 
   @Override

testng-core/src/main/java/org/testng/internal/annotations/JDK15TagFactory.java

@@ -644,7 +644,7 @@ private Object invokeMethod(Annotation test, String methodName) {
     Object result = null;
     try {
       // Note:  we should cache methods already looked up
-      Method m = test.getClass().getMethod(methodName);
+      Method m = test.annotationType().getMethod(methodName);
       result = m.invoke(test);
     } catch (Exception e) {
       Logger.getLogger(JDK15TagFactory.class).error(e.getMessage(), e);

testng-core/src/test/java/NoPackageTest.java

@@ -1,3 +1,5 @@
+import static org.testng.Assert.assertTrue;
+
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
 
@@ -12,6 +14,6 @@ public void test() {
 
   @AfterMethod(groups = {"nopackage"})
   public void after() {
-    assert m_run : "test method was not run";
+    assertTrue(m_run, "test method was not run");
   }
 }

testng-core/src/test/java/test/BaseTest.java

@@ -1,5 +1,9 @@
 package test;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertSame;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -158,8 +162,8 @@ public void setFailedConfigs(Map<String, List<ITestResult>> m) {
   }
 
   protected void run() {
-    assert null != getTest()
-        : "Test wasn't set, maybe @Configuration methodSetUp() was never called";
+    assertNotNull(
+        getTest(), "Test wasn't set, maybe @Configuration methodSetUp() was never called");
     setPassedTests(Maps.newHashMap());
     setFailedTests(Maps.newHashMap());
     setSkippedTests(Maps.newHashMap());
@@ -314,9 +318,10 @@ protected void verifyResults(Map<String, List<ITestResult>> tests, int expected,
       Object firstKey = keys.iterator().next();
       List<ITestResult> passedResult = tests.get(firstKey);
       int n = passedResult.size();
-      assert n == expected : "Expected " + expected + " " + message + " but found " + n;
+      assertSame(n, expected, "Expected " + expected + " " + message + " but found " + n);
     } else {
-      assert expected == 0 : "Expected " + expected + " " + message + " but found " + tests.size();
+      assertEquals(
+          0, expected, "Expected " + expected + " " + message + " but found " + tests.size());
     }
   }
 

testng-core/src/test/java/test/ClassConfigurations.java

@@ -1,5 +1,7 @@
 package test;
 
+import static org.testng.Assert.assertEquals;
+
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -29,22 +31,19 @@ public void afterTestClass() {
 
   @Test
   public void testOne() {
-    //    System.out.println("testOne");
-    assert beforeCount == 1;
-    assert afterCount == 0;
+    assertEquals(beforeCount, 1);
+    assertEquals(afterCount, 0);
   }
 
   @Test
   public void testTwo() {
-    //    System.out.println("testTwo");
-    assert beforeCount == 1;
-    assert afterCount == 0;
+    assertEquals(beforeCount, 1);
+    assertEquals(afterCount, 0);
   }
 
   @Test
   public void testThree() {
-    //    System.out.println("testThree");
-    assert beforeCount == 1;
-    assert afterCount == 0;
+    assertEquals(beforeCount, 1);
+    assertEquals(afterCount, 0);
   }
 }

testng-core/src/test/java/test/CtorCalledOnce.java

@@ -1,5 +1,7 @@
 package test;
 
+import static org.testng.Assert.assertEquals;
+
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.Test;
 
@@ -16,17 +18,17 @@ public CtorCalledOnce() {
 
   @Test
   public void testMethod1() {
-    assert instantiated == 1 : "Expected 1, was invoked " + instantiated + " times";
+    assertEquals(instantiated, 1, "Expected 1, was invoked " + instantiated + " times");
   }
 
   @Test
   public void testMethod2() {
-    assert instantiated == 1 : "Expected 1, was invoked " + instantiated + " times";
+    assertEquals(instantiated, 1, "Expected 1, was invoked " + instantiated + " times");
   }
 
   @Test
   public void testMethod3() {
-    assert instantiated == 1 : "Expected 1, was invoked " + instantiated + " times";
+    assertEquals(instantiated, 1, "Expected 1, was invoked " + instantiated + " times");
   }
 
   @AfterTest

testng-core/src/test/java/test/Exclude.java

@@ -1,5 +1,7 @@
 package test;
 
+import static org.testng.Assert.assertTrue;
+
 import org.testng.annotations.Test;
 
 public class Exclude {
@@ -32,14 +34,15 @@ public void excluded2() {
       dependsOnGroups = {"group1"},
       groups = {"group2"})
   public void verify() {
-    assert m_included1 && m_included2 && m_excluded1 && m_excluded2
-        : "Should all be true: "
+    assertTrue(
+        m_included1 && m_included2 && m_excluded1 && m_excluded2,
+        "Should all be true: "
             + m_included1
             + " "
             + m_included2
             + " "
             + m_excluded1
             + " "
-            + m_excluded2;
+            + m_excluded2);
   }
 }