Make migrated AssertJ assertions idiomatic

The TestNgToAssertj recipe only ports the API: it turns Assert.assertX(cond)
into assertThat(cond).isTrue(), so predicate expressions kept the original
boolean shape and produced unhelpful "expected true but was false" failures.

Run the AssertJ best-practices cleanup (the org.openrewrite.java.testing.assertj.Assertj
aggregate, minus the cross-framework migrators so the intentional JUnit-interop
fixtures are left untouched) as a one-shot over testng-core's tests. This rewrites
predicates to dedicated assertions with proper failure messages, e.g.:

  assertThat(list.size()).isEqualTo(3)        -> assertThat(list).hasSize(3)
  assertThat(time < 2000).isTrue()            -> assertThat(time).isLessThan(2000)
  assertThat(c.isEmpty()).isFalse()           -> assertThat(c).isNotEmpty()
  assertThat(s.contains(x)).isTrue()          -> assertThat(s).contains(x)
  assertThat(n).isEqualTo(0)                  -> assertThat(n).isZero()

instanceof predicates are not handled by any existing recipe (tracked upstream as
openrewrite/rewrite-testing-frameworks#1030), so they were converted by hand:

  assertThat(o instanceof T).isTrue()         -> assertThat(o).isInstanceOf(T.class)

A few assertions the recipes can't reach were also tidied by hand (e.g. in GraphTest):
reversed actual/expected and boolean-OR equality chains:

  assertThat(n).isEqualTo(x.size())           -> assertThat(x).hasSize(n)
  assertThat(a.equals(x) || b.equals(x))      -> assertThat(x).isIn(a, b)
      .isTrue()

One assertion was fixed by hand too: the recipe rewrote `null != x` to the ambiguous
`assertThat(null).isNotSameAs(x)` (tracked as PicnicSupermarket/error-prone-support#2276);
replaced with `assertThat(x).isNotNull()`.

Author: juherr

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

@@ -17,7 +17,6 @@ public void testDeserialize() {
     ReporterConfig config = ReporterConfig.deserialize(CONFIG_STR);
     assertThat(Objects.requireNonNull(config).getClassName()).isEqualTo(CLASS_NAME);
     String serial = config.serialize();
-    assertThat(serial.contains(PROP_NAME_1 + "=true")).isTrue();
-    assertThat(serial.contains(PROP_NAME_2 + "=true")).isTrue();
+    assertThat(serial).contains(PROP_NAME_1 + "=true").contains(PROP_NAME_2 + "=true");
   }
 }

testng-core/src/test/java/org/testng/JarFileUtilsTest.java

@@ -135,7 +135,7 @@ public void ensureThatExceptionAreNotThrown() throws MalformedURLException {
     testNg.initializeSuitesAndJarFile();
     // "testng-tests-child2", "testng-tests-child4", "testng-tests-child5" are from 3 different test
     // suites
-    assertThat(testNg.m_suites.size()).isEqualTo(3);
+    assertThat(testNg.m_suites).hasSize(3);
   }
 
   /**
@@ -154,7 +154,7 @@ public void ensureThatExceptionAreThrown() throws MalformedURLException {
     testNg.setXmlPathInJar("jarfileutils/testng-tests.xml");
     testNg.setTestJar(jar.getAbsolutePath());
     testNg.initializeSuitesAndJarFile();
-    assertThat(testNg.m_suites.size()).isEqualTo(1);
+    assertThat(testNg.m_suites).hasSize(1);
   }
 
   @Test

testng-core/src/test/java/org/testng/internal/DynamicGraphHelperTest.java

@@ -6,7 +6,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
 import org.testng.ITestClass;
 import org.testng.ITestNGMethod;
 import org.testng.ITestObjectFactory;
@@ -150,10 +149,8 @@ public void testCreateDynamicGraphWithPackageWithAbstractClassPreserveOrderTrue(
     XmlTest xmlTest = createXmlTest("2249_suite", "2249_test", classes);
     xmlTest.setPreserveOrder(true);
     DynamicGraph<ITestNGMethod> graph = newGraph(xmlTest, classes);
-    assertThat(
-            graph.getFreeNodes().stream()
-                .map(ITestNGMethod::getMethodName)
-                .collect(Collectors.toList()))
+    assertThat(graph.getFreeNodes())
+        .extracting(ITestNGMethod::getMethodName)
         .containsExactly("a1", "a2");
   }
 
@@ -162,10 +159,8 @@ public void testCreateDynamicGraphWithPackageWithoutAbstractClass(Class<?>[] cla
     XmlTest xmlTest = createXmlTest("2249_suite", "2249_test", classes);
     xmlTest.setPreserveOrder(false);
     DynamicGraph<ITestNGMethod> graph = newGraph(xmlTest, classes);
-    assertThat(
-            graph.getFreeNodes().stream()
-                .map(ITestNGMethod::getMethodName)
-                .collect(Collectors.toList()))
+    assertThat(graph.getFreeNodes())
+        .extracting(ITestNGMethod::getMethodName)
         .containsExactly("a1", "a2", "b2", "b1");
   }
 

testng-core/src/test/java/org/testng/internal/DynamicGraphTest.java

@@ -43,7 +43,7 @@ private static <T> void assertFreeNodesEquals(IDynamicGraph<T> graph, T... expec
 
   private static <T> void assertFreeNodesEquals(IDynamicGraph<T> graph, List<T> expected) {
     // Compare free nodes using isEqualTo instead of containsOnly as we care about ordering too.
-    assertThat(graph.getFreeNodes()).isEqualTo(expected);
+    assertThat(graph.getFreeNodes()).containsExactlyElementsOf(expected);
   }
 
   @Test
@@ -261,7 +261,7 @@ public void edgeWeightTest1() {
     InvokedMethodNameListener listener = new InvokedMethodNameListener();
     tng.addListener(listener);
     tng.run();
-    assertThat(listener.getSucceedMethodNames()).isEqualTo(expectedOrder1);
+    assertThat(listener.getSucceedMethodNames()).containsExactlyElementsOf(expectedOrder1);
   }
 
   @Test
@@ -271,15 +271,15 @@ public void edgeWeightTest2() {
     InvokedMethodNameListener listener = new InvokedMethodNameListener();
     tng.addListener(listener);
     tng.run();
-    assertThat(listener.getSucceedMethodNames()).isEqualTo(expectedOrder2);
+    assertThat(listener.getSucceedMethodNames()).containsExactlyElementsOf(expectedOrder2);
   }
 
   private static void runAssertion(IDynamicGraph<ITestNGMethod> graph, List<String> expected) {
     List<ITestNGMethod> p1Methods = graph.getFreeNodes();
-    assertThat(p1Methods.size()).isEqualTo(3);
+    assertThat(p1Methods).hasSize(3);
     graph.setStatus(p1Methods, Status.FINISHED);
     for (ITestNGMethod p1Method : p1Methods) {
-      assertThat(expected.contains(constructName(p1Method))).isTrue();
+      assertThat(expected).contains(constructName(p1Method));
     }
   }
 
@@ -297,7 +297,7 @@ public void testDuplicationFunctionality() {
     testng.addListener(tla);
     testng.run();
     int expected = tla.getMultiplyCount() + tla.getOriginalMethodCount();
-    assertThat(tla.getPassedTests().size()).isEqualTo(expected);
+    assertThat(tla.getPassedTests()).hasSize(expected);
   }
 
   @Test(expectedExceptions = IllegalStateException.class)
@@ -324,22 +324,22 @@ public void testAllowedCycles() {
   public void testGainWeight() {
     DynamicGraph<String> dg = new DynamicGraph<>();
     dg.addEdge(1, "a", "b");
-    assertThat(dg.getEdges().values().size()).isEqualTo(1);
-    assertThat(dg.getEdges().get("a").get("b")).isEqualTo(1);
+    assertThat(dg.getEdges().values()).hasSize(1);
+    assertThat(dg.getEdges().get("a")).containsEntry("b", 1);
 
     // Duplicated edge, but with lower weight
     dg.addEdge(0, "a", "b");
 
     // Should only be one edge with same weight
-    assertThat(dg.getEdges().values().size()).isEqualTo(1);
-    assertThat(dg.getEdges().get("a").get("b")).isEqualTo(1);
+    assertThat(dg.getEdges().values()).hasSize(1);
+    assertThat(dg.getEdges().get("a")).containsEntry("b", 1);
 
     // Duplicated edge, but with higher weight
     dg.addEdge(2, "a", "b");
 
     // Should only be one edge with weight of 2 now.
-    assertThat(dg.getEdges().values().size()).isEqualTo(1);
-    assertThat(dg.getEdges().get("a").get("b")).isEqualTo(2);
+    assertThat(dg.getEdges().values()).hasSize(1);
+    assertThat(dg.getEdges().get("a")).containsEntry("b", 2);
   }
 
   /**
@@ -421,7 +421,7 @@ public void testParallel() {
 
     // all done
     assertThat(dg.getFreeNodes()).isEmpty();
-    assertThat(dg.getNodeCountWithStatus(Status.READY)).isEqualTo(0);
+    assertThat(dg.getNodeCountWithStatus(Status.READY)).isZero();
     assertThat(dg.getNodeCountWithStatus(Status.FINISHED)).isEqualTo(100);
   }
 }

testng-core/src/test/java/org/testng/internal/objects/GuiceHelperTest.java

@@ -29,7 +29,7 @@ public void getInjector_spiModule_injectorHasModule() {
     assertThat(injector).isNotNull();
     Module[] modules = injector.getModules();
     assertThat(modules).isNotNull();
-    assertThat(modules.length).isEqualTo(1);
+    assertThat(modules.length).isOne();
     assertThat(modules[0]).isEqualTo(new SampleIModule().getModule());
   }
 

testng-core/src/test/java/org/testng/internal/objects/InstanceCreatorTest.java

@@ -29,7 +29,7 @@ public void testCreateInstance1WithOneArgStringParamForConstructor() {
     Object object =
         SimpleObjectDispenser.createInstance(
             declaringClass, classes, xmlTest, finder, objectFactory, false, "");
-    assertThat((object instanceof ITest)).isTrue();
+    assertThat(object).isInstanceOf(ITest.class);
     assertThat(((ITest) object).getTestName()).isEqualTo(GITHUB_1456);
   }
 }

testng-core/src/test/java/org/testng/xml/ParserTest.java

@@ -16,7 +16,7 @@ public class ParserTest {
   public void testParsing(String file) throws Exception {
     Parser parser = new Parser(file);
     List<XmlSuite> suites = parser.parseToList();
-    assertThat(suites.size()).isEqualTo(1);
+    assertThat(suites).hasSize(1);
   }
 
   @DataProvider(name = "dp")

testng-core/src/test/java/org/testng/xml/XmlSuiteTest.java

@@ -54,8 +54,8 @@ public void testTimeOut(String timeout, int size, int lineNumber) {
     StringReader stringReader = new StringReader(suite.toXml());
     List<String> resultLines = Lists.newArrayList();
     List<Integer> lineNumbers = grep(stringReader, "time-out=\"1000\"", resultLines);
-    assertThat(lineNumbers).size().isEqualTo(size);
-    assertThat(resultLines).size().isEqualTo(size);
+    assertThat(lineNumbers).hasSize(size);
+    assertThat(resultLines).hasSize(size);
     if (size > 0) {
       assertThat(lineNumbers.get(size - 1)).isEqualTo(lineNumber);
     }
@@ -88,12 +88,12 @@ public void ensureSuiteLevelPackageIsAppliedToAllTests() throws IOException {
     Parser parser = new Parser("src/test/resources/xml/issue435.xml");
     List<XmlSuite> suites = parser.parseToList();
     XmlSuite xmlsuite = suites.get(0);
-    assertThat(xmlsuite.getTests().get(0).getClasses().size()).isEqualTo(0);
+    assertThat(xmlsuite.getTests().get(0).getClasses()).isEmpty();
     TestNG testNG = create();
     testNG.setXmlSuites(suites);
     testNG.setUseDefaultListeners(false);
     testNG.run();
-    assertThat(xmlsuite.getTests().get(0).getClasses().size()).isEqualTo(1);
+    assertThat(xmlsuite.getTests().get(0).getClasses()).hasSize(1);
   }
 
   @Test(description = "GITHUB-1674")
@@ -105,12 +105,12 @@ public void ensureSuiteLevelBeanshellIsAppliedToAllTests() throws IOException {
       Parser parser = new Parser("src/test/resources/xml/issue1674.xml");
       List<XmlSuite> suites = parser.parseToList();
       XmlSuite xmlsuite = suites.get(0);
-      assertThat(xmlsuite.getTests().get(0).getMethodSelectors().size()).isEqualTo(0);
+      assertThat(xmlsuite.getTests().get(0).getMethodSelectors()).isEmpty();
       TestNG testNG = create();
       testNG.setXmlSuites(suites);
       testNG.setUseDefaultListeners(false);
       testNG.run();
-      assertThat(xmlsuite.getTests().get(0).getMethodSelectors().size()).isEqualTo(1);
+      assertThat(xmlsuite.getTests().get(0).getMethodSelectors()).hasSize(1);
       assertThat(stream.toString()).contains(Arrays.asList("rajni", "kamal", "mgr"));
     } finally {
       System.setOut(current);
@@ -193,23 +193,23 @@ public void checkDuplicateChildSuites() throws IOException {
     Parser parser = new Parser(path);
     List<XmlSuite> suites = parser.parseToList();
     XmlSuite rootSuite = suites.get(0);
-    assertThat(rootSuite.getChildSuites().size()).isEqualTo(4);
+    assertThat(rootSuite.getChildSuites()).hasSize(4);
 
     XmlSuite suite3 = rootSuite.getChildSuites().get(1);
     assertThat(suite3.getName()).isEqualTo("Child Suite 3");
-    assertThat(suite3.getChildSuites().size()).isEqualTo(3);
+    assertThat(suite3.getChildSuites()).hasSize(3);
 
     XmlSuite suite3_0 = rootSuite.getChildSuites().get(3);
     assertThat(suite3.getName()).isEqualTo("Child Suite 3");
-    assertThat(suite3_0.getChildSuites().size()).isEqualTo(3);
+    assertThat(suite3_0.getChildSuites()).hasSize(3);
 
     XmlSuite suite5 = suite3.getChildSuites().get(2);
     assertThat(suite5.getName()).isEqualTo("Child Suite 5");
-    assertThat(suite5.getTests().size()).isEqualTo(1);
+    assertThat(suite5.getTests()).hasSize(1);
 
     XmlSuite suite5_0 = suite3_0.getChildSuites().get(2);
     assertThat(suite5_0.getName()).isEqualTo("Child Suite 5");
-    assertThat(suite5_0.getTests().size()).isEqualTo(1);
+    assertThat(suite5_0.getTests()).hasSize(1);
   }
 
   private static void runTests(
@@ -220,8 +220,8 @@ private static void runTests(
     } catch (IOException e) {
       throw new TestNGException(e);
     }
-    assertThat(suites.size()).isEqualTo(1);
-    assertThat(suites.get(0).getChildSuites().size()).isEqualTo(childSuitesCount);
+    assertThat(suites).hasSize(1);
+    assertThat(suites.get(0).getChildSuites()).hasSize(childSuitesCount);
     TestNG testng = create(suites);
     SuiteCounter listener = new SuiteCounter();
     testng.addListener((ITestNGListener) listener);

testng-core/src/test/java/org/testng/xml/XmlTestTest.java

@@ -48,7 +48,7 @@ public void testXMLClassesInCloneMethod() {
     XmlTest copyXmlTest = (XmlTest) xmlTest.clone();
     assertThat(copyXmlTest).isNotNull();
     assertThat(copyXmlTest.getXmlClasses()).isNotNull();
-    assertThat(xmlTest.getXmlClasses().size()).isEqualTo(copyXmlTest.getXmlClasses().size());
+    assertThat(xmlTest.getXmlClasses()).hasSameSizeAs(copyXmlTest.getXmlClasses());
   }
 
   private static Map<String, String> newSetOfParameters(String key, String value) {

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

@@ -17,9 +17,9 @@ protected void verifyTests(String title, String[] exp, Map<String, List<ITestRes
       expected.put(element, element);
     }
 
-    assertThat(found.size())
+    assertThat(found)
         .withFailMessage("Verification for " + title + " tests failed:")
-        .isEqualTo(expected.size());
+        .hasSameSizeAs(expected);
 
     for (String o : expected.values()) {
       if (null == found.get(o)) {