Migrate testng-core's internal tests from org.testng.Assert to AssertJ

build-logic/code-quality/src/main/kotlin/testng.testing.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 dependencies {
-    testImplementation("org.assertj:assertj-core:3.23.1")
+    testImplementation("org.assertj:assertj-core:3.27.7")
 }
 
 tasks.withType<Test>().configureEach {

testng-api/testng-api-build.gradle.kts

@@ -6,6 +6,5 @@ plugins {
 javaPlatform.allowDependencies()
 
 dependencies {
-    api(projects.testngAsserts)
     api(projects.testngCoreApi)
 }

testng-core/src/test/groovy/test/groovy/issue2854/AssertionsTestSample.groovy

@@ -2,56 +2,56 @@ package test.groovy.issue2854
 
 import org.testng.annotations.Test
 
-import static org.testng.Assert.assertEquals
+import static org.assertj.core.api.Assertions.assertThat
 
 class AssertionsTestSample {
 
     @Test
     void testAssertEqualsWorksWithBooleans() {
-        assertEquals(true, true)
-        assertEquals(true, true, "Sample Message")
+        assertThat(true).isEqualTo(true)
+        assertThat(true).as("Sample Message").isEqualTo(true)
     }
 
     @Test
     void testAssertEqualsWorksWithBytes() {
-        assertEquals(Byte.valueOf((byte) 10), Byte.valueOf((byte) 10))
-        assertEquals(Byte.valueOf((byte) 10), Byte.valueOf((byte) 10), "Sample Message")
+        assertThat(Byte.valueOf((byte) 10)).isEqualTo(Byte.valueOf((byte) 10))
+        assertThat(Byte.valueOf((byte) 10)).as("Sample Message").isEqualTo(Byte.valueOf((byte) 10))
     }
 
     @Test
     void testAssertEqualsWorksWithChars() {
-        assertEquals(Character.valueOf((char) 10), Character.valueOf((char) 10))
-        assertEquals(Character.valueOf((char) 10), Character.valueOf((char) 10), "Sample Message")
+        assertThat(Character.valueOf((char) 10)).isEqualTo(Character.valueOf((char) 10))
+        assertThat(Character.valueOf((char) 10)).as("Sample Message").isEqualTo(Character.valueOf((char) 10))
     }
 
     @Test
     void testAssertEqualsWorksWithShorts() {
-        assertEquals(Short.valueOf((short) 10), Short.valueOf((short) 10))
-        assertEquals(Short.valueOf((short) 10), Short.valueOf((short) 10), "Sample Message")
+        assertThat(Short.valueOf((short) 10)).isEqualTo(Short.valueOf((short) 10))
+        assertThat(Short.valueOf((short) 10)).as("Sample Message").isEqualTo(Short.valueOf((short) 10))
     }
 
     @Test
     void testAssertEqualsWorksWithInts() {
-        assertEquals(10, 10)
-        assertEquals(10, 10, "Sample Message")
+        assertThat(10).isEqualTo(10)
+        assertThat(10).as("Sample Message").isEqualTo(10)
     }
 
     @Test
     void testAssertEqualsWorksWithLongs() {
-        assertEquals(Long.valueOf((long) 10), Long.valueOf((long) 10))
-        assertEquals(Long.valueOf((long) 10), Long.valueOf((long) 10), "Sample Message")
+        assertThat(Long.valueOf((long) 10)).isEqualTo(Long.valueOf((long) 10))
+        assertThat(Long.valueOf((long) 10)).as("Sample Message").isEqualTo(Long.valueOf((long) 10))
     }
 
     @Test
     void testAssertEqualsWorksWithFloats() {
-        assertEquals(Float.valueOf((float) 10), Float.valueOf((float) 10))
-        assertEquals(Float.valueOf((float) 10), Float.valueOf((float) 10), "Sample Message")
+        assertThat(Float.valueOf((float) 10)).isEqualTo(Float.valueOf((float) 10))
+        assertThat(Float.valueOf((float) 10)).as("Sample Message").isEqualTo(Float.valueOf((float) 10))
     }
 
     @Test
     void testAssertEqualsWorksWithDoubles() {
-        assertEquals(Double.valueOf((double) 10), Double.valueOf((double) 10))
-        assertEquals(Double.valueOf((double) 10), Double.valueOf((double) 10), "Sample Message")
+        assertThat(Double.valueOf((double) 10)).isEqualTo(Double.valueOf((double) 10))
+        assertThat(Double.valueOf((double) 10)).as("Sample Message").isEqualTo(Double.valueOf((double) 10))
     }
 
 }

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

@@ -1,4 +1,4 @@
-import static org.testng.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
@@ -14,6 +14,6 @@ public void test() {
 
   @AfterMethod(groups = {"nopackage"})
   public void after() {
-    assertTrue(m_run, "test method was not run");
+    assertThat(m_run).withFailMessage("test method was not run").isTrue();
   }
 }

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

@@ -1,5 +1,4 @@
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Objects;
 import org.testng.annotations.Test;
@@ -16,9 +15,8 @@ public class ReporterConfigTest {
   @Test
   public void testDeserialize() {
     ReporterConfig config = ReporterConfig.deserialize(CONFIG_STR);
-    assertEquals(Objects.requireNonNull(config).getClassName(), CLASS_NAME);
+    assertThat(Objects.requireNonNull(config).getClassName()).isEqualTo(CLASS_NAME);
     String serial = config.serialize();
-    assertTrue(serial.contains(PROP_NAME_1 + "=true"));
-    assertTrue(serial.contains(PROP_NAME_2 + "=true"));
+    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
-    Assert.assertEquals(testNg.m_suites.size(), 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();
-    Assert.assertEquals(testNg.m_suites.size(), 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

@@ -5,7 +5,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import org.testng.Assert;
 import org.testng.IDynamicGraph;
 import org.testng.IDynamicGraph.Status;
 import org.testng.ITestNGMethod;
@@ -44,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
@@ -262,7 +261,7 @@ public void edgeWeightTest1() {
     InvokedMethodNameListener listener = new InvokedMethodNameListener();
     tng.addListener(listener);
     tng.run();
-    Assert.assertEquals(listener.getSucceedMethodNames(), expectedOrder1);
+    assertThat(listener.getSucceedMethodNames()).containsExactlyElementsOf(expectedOrder1);
   }
 
   @Test
@@ -272,15 +271,15 @@ public void edgeWeightTest2() {
     InvokedMethodNameListener listener = new InvokedMethodNameListener();
     tng.addListener(listener);
     tng.run();
-    Assert.assertEquals(listener.getSucceedMethodNames(), expectedOrder2);
+    assertThat(listener.getSucceedMethodNames()).containsExactlyElementsOf(expectedOrder2);
   }
 
   private static void runAssertion(IDynamicGraph<ITestNGMethod> graph, List<String> expected) {
     List<ITestNGMethod> p1Methods = graph.getFreeNodes();
-    Assert.assertEquals(p1Methods.size(), 3);
+    assertThat(p1Methods).hasSize(3);
     graph.setStatus(p1Methods, Status.FINISHED);
     for (ITestNGMethod p1Method : p1Methods) {
-      Assert.assertTrue(expected.contains(constructName(p1Method)));
+      assertThat(expected).contains(constructName(p1Method));
     }
   }
 
@@ -298,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)
@@ -325,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);
   }
 
   /**
@@ -422,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/MethodInstanceTest.java

@@ -1,11 +1,12 @@
 package org.testng.internal;
 
+import static org.assertj.core.api.Assertions.fail;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
-import org.testng.Assert;
 import org.testng.IClass;
 import org.testng.IRetryAnalyzer;
 import org.testng.ITestClass;
@@ -69,7 +70,7 @@
     try {
       methods.sort(MethodInstance.SORT_BY_INDEX);
     } catch (IllegalArgumentException ex) {
-      Assert.fail("Comparison method violates its general contract!");
+      fail("Comparison method violates its general contract!");
     }
   }
 
@@ -162,7 +163,7 @@
     }
 
     @Override
     public void addInstance(Object instance) {}
 
     @Override
     public void addObject(IObject.IdentifiableObject instance) {
@@ -170,7 +171,7 @@
     }
 
     @Override
     public Object[] getInstances(boolean reuse) {
       return null;
     }
 
@@ -180,7 +181,7 @@
     }
 
     @Override
     public long[] getInstanceHashCodes() {
       return null;
     }
 

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

@@ -1,7 +1,8 @@
 package org.testng.internal;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import java.lang.reflect.Method;
-import org.testng.Assert;
 import org.testng.annotations.Optional;
 import org.testng.annotations.Parameters;
 import org.testng.annotations.Test;
@@ -22,7 +23,7 @@ public void filterOutInJectedTypesFromOptionalValuesTest(
     FilterOutInjectedTypesResult filterOutResult =
         org.testng.internal.Parameters.filterOutInjectedTypesFromOptionalValues(
             curMethod.getParameterTypes(), finder.findOptionalValues(curMethod));
-    Assert.assertEquals(filterOutResult.getOptionalValues()[0], "optionaltestdata");
-    Assert.assertEquals(filterOutResult.getParameterTypes()[0], String.class);
+    assertThat(filterOutResult.getOptionalValues()[0]).isEqualTo("optionaltestdata");
+    assertThat(filterOutResult.getParameterTypes()[0]).isEqualTo(String.class);
   }
 }

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

@@ -3,7 +3,6 @@
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.testng.Assert.assertEquals;
 import static org.testng.internal.Utils.join;
 
 import java.util.List;
@@ -20,27 +19,27 @@ public class UtilsTest {
 
   @Test
   public void escapeUnicode() {
-    assertEquals(Utils.escapeUnicode("test"), "test");
-    assertEquals(
-        Utils.escapeUnicode(String.valueOf(INVALID_CHAR)), String.valueOf(REPLACEMENT_CHAR));
+    assertThat(Utils.escapeUnicode("test")).isEqualTo("test");
+    assertThat(Utils.escapeUnicode(String.valueOf(INVALID_CHAR)))
+        .isEqualTo(String.valueOf(REPLACEMENT_CHAR));
   }
 
   @Test
   public void createEmptyStringWhenJoiningEmptyListWithJoin() {
     List<String> emptyList = emptyList();
-    assertEquals("", join(emptyList, ","));
+    assertThat("").isEqualTo(join(emptyList, ","));
   }
 
   @Test
   public void joinTwoStringsWithJoinStrings() {
     List<String> twoStrings = asList("one", "two");
-    assertEquals("one,two", Utils.join(twoStrings, ","));
+    assertThat("one,two").isEqualTo(Utils.join(twoStrings, ","));
   }
 
   @Test
   public void createEmptyStringWhenJoiningEmptyListWithJoinStrings() {
     List<String> emptyList = emptyList();
-    assertEquals("", Utils.join(emptyList, ","));
+    assertThat("").isEqualTo(Utils.join(emptyList, ","));
   }
 
   @Test

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

@@ -1,13 +1,11 @@
 package org.testng.internal.objects;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import com.google.inject.Injector;
 import com.google.inject.Module;
 import com.google.inject.Stage;
 import org.jetbrains.annotations.Nullable;
-import org.testng.Assert;
 import org.testng.IInjectorFactory;
 import org.testng.ITest;
 import org.testng.ITestObjectFactory;
@@ -28,11 +26,11 @@ public void getInjector_spiModule_injectorHasModule() {
     MockInjector injector =
         (MockInjector) guiceHelper.getInjector(new MockClass(), new MockInjectorFactory());
 
-    assertNotNull(injector);
+    assertThat(injector).isNotNull();
     Module[] modules = injector.getModules();
-    assertNotNull(modules);
-    assertEquals(modules.length, 1);
-    Assert.assertEquals(modules[0], new SampleIModule().getModule());
+    assertThat(modules).isNotNull();
+    assertThat(modules.length).isOne();
+    assertThat(modules[0]).isEqualTo(new SampleIModule().getModule());
   }
 
   private static final class MockInjectorFactory implements IInjectorFactory {