Convert assertThat(x.equals(y)).isTrue() to assertThat(x).isEqualTo(y)

Search:

  assertThat\((?!\s*Arrays\.)((?:[^()]+|\([^()]*\))+)\.equals\(\s*((?:[^()]+|\([^()]*\))+)\s*\)\)(.*)\.isTrue\(\)

Replace:

  assertThat($1)$3.isEqualTo($2)

See gh-36504

spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java

@@ -152,8 +152,8 @@ class XmlBeanFactoryTests {
 		assertThat(emmasJenks.getName()).as("Emmas jenks has right name").isEqualTo("Andrew");
 		assertThat(emmasJenks).as("Emmas doesn't equal new ref").isNotSameAs(xbf.getBean("jenks"));
 		assertThat(georgiasJenks.getName()).as("Georgias jenks has right name").isEqualTo("Andrew");
-		assertThat(emmasJenks.equals(georgiasJenks)).as("They are object equal").isTrue();
-		assertThat(emmasJenks.equals(xbf.getBean("jenks"))).as("They object equal direct ref").isTrue();
+		assertThat(emmasJenks).as("They are object equal").isEqualTo(georgiasJenks);
+		assertThat(emmasJenks).as("They object equal direct ref").isEqualTo(xbf.getBean("jenks"));
 	}
 
 	@Test

spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java

@@ -58,7 +58,7 @@ class DataBinderFieldAccessTests {
 		Map<?, ?> m = binder.getBindingResult().getModel();
 		assertThat(m).as("There is one element in map").hasSize(2);
 		FieldAccessBean tb = (FieldAccessBean) m.get("person");
-		assertThat(tb.equals(rod)).as("Same object").isTrue();
+		assertThat(tb).as("Same object").isEqualTo(rod);
 	}
 
 	@Test

spring-context/src/test/java/org/springframework/validation/DataBinderTests.java

@@ -113,7 +113,7 @@ class DataBinderTests {
 		Map<?, ?> map = binder.getBindingResult().getModel();
 		assertThat(map).as("There is one element in map").hasSize(2);
 		TestBean tb = (TestBean) map.get("person");
-		assertThat(tb.equals(rod)).as("Same object").isTrue();
+		assertThat(tb).as("Same object").isEqualTo(rod);
 
 		BindingResult other = new DataBinder(rod, "person").getBindingResult();
 		assertThat(binder.getBindingResult()).isEqualTo(other);
@@ -793,7 +793,7 @@ class DataBinderTests {
 		Map<?,?> m = binder.getBindingResult().getModel();
 		assertThat(m).as("There is one element in map").hasSize(2);
 		TestBean tb = (TestBean) m.get("person");
-		assertThat(tb.equals(rod)).as("Same object").isTrue();
+		assertThat(tb).as("Same object").isEqualTo(rod);
 	}
 
 	@Test

spring-context/src/testFixtures/java/org/springframework/context/testfixture/AbstractApplicationContextTests.java

@@ -109,19 +109,19 @@ public abstract class AbstractApplicationContextTests extends AbstractListableBe
 	@Test
 	protected void overrideWorked() {
 		TestBean rod = (TestBean) applicationContext.getParent().getBean("rod");
-		assertThat(rod.getName().equals("Roderick")).as("Parent's name differs").isTrue();
+		assertThat(rod.getName()).as("Parent's name differs").isEqualTo("Roderick");
 	}
 
 	@Test
 	protected void grandparentDefinitionFound() {
 		TestBean dad = (TestBean) applicationContext.getBean("father");
-		assertThat(dad.getName().equals("Albert")).as("Dad has correct name").isTrue();
+		assertThat(dad.getName()).as("Dad has correct name").isEqualTo("Albert");
 	}
 
 	@Test
 	protected void grandparentTypedDefinitionFound() {
 		TestBean dad = applicationContext.getBean("father", TestBean.class);
-		assertThat(dad.getName().equals("Albert")).as("Dad has correct name").isTrue();
+		assertThat(dad.getName()).as("Dad has correct name").isEqualTo("Albert");
 	}
 
 	@Test