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
This commit is contained in:
Sam Brannen
2026-03-19 17:06:37 +01:00
parent 2ce21f7654
commit 87c4acd7ac
28 changed files with 149 additions and 167 deletions
@@ -71,18 +71,18 @@ class HttpEntityTests {
HttpHeaders headers2 = new HttpHeaders();
headers2.set("Content-Type", "application/json");
assertThat(new HttpEntity<>().equals(new HttpEntity<>())).isTrue();
assertThat(new HttpEntity<>()).isEqualTo(new HttpEntity<>());
assertThat(new HttpEntity<>(headers1)).isNotEqualTo(new HttpEntity<>());
assertThat(new HttpEntity<>()).isNotEqualTo(new HttpEntity<>(headers2));
assertThat(new HttpEntity<>(headers1).equals(new HttpEntity<>(headers1))).isTrue();
assertThat(new HttpEntity<>(headers1)).isEqualTo(new HttpEntity<>(headers1));
assertThat(new HttpEntity<>(headers1)).isNotEqualTo(new HttpEntity<>(headers2));
assertThat(new HttpEntity<String>(null, (HttpHeaders) null).equals(new HttpEntity<>(null, (HttpHeaders) null))).isTrue();
assertThat(new HttpEntity<>("foo", (HttpHeaders) null)).isNotEqualTo(new HttpEntity<>(null, (HttpHeaders) null));
assertThat(new HttpEntity<String>(null, (HttpHeaders) null)).isNotEqualTo(new HttpEntity<>("bar", (HttpHeaders) null));
assertThat(new HttpEntity<>("foo", headers1).equals(new HttpEntity<>("foo", headers1))).isTrue();
assertThat(new HttpEntity<>("foo", headers1)).isEqualTo(new HttpEntity<>("foo", headers1));
assertThat(new HttpEntity<>("foo", headers1)).isNotEqualTo(new HttpEntity<>("bar", headers1));
}
@@ -250,7 +250,7 @@ class ServletRequestDataBinderTests {
Object val = m.get(element.getName());
assertThat(val).as("Can't have unexpected value").isNotNull();
assertThat(val).as("Val i string").isInstanceOf(String.class);
assertThat(val.equals(element.getValue())).as("val matches expected").isTrue();
assertThat(val).as("val matches expected").isEqualTo(element.getValue());
m.remove(element.getName());
}
assertThat(m.size()).as("Map size is 0").isEqualTo(0);
@@ -205,7 +205,7 @@ class ServletRequestUtilsTests {
request.addParameter("param5", "1");
request.addParameter("paramEmpty", "");
assertThat(ServletRequestUtils.getBooleanParameter(request, "param1").equals(Boolean.TRUE)).isTrue();
assertThat(ServletRequestUtils.getBooleanParameter(request, "param1")).isEqualTo(Boolean.TRUE);
assertThat(ServletRequestUtils.getBooleanParameter(request, "param1", false)).isTrue();
assertThat(ServletRequestUtils.getRequiredBooleanParameter(request, "param1")).isTrue();
@@ -333,7 +333,7 @@ class WebRequestDataBinderTests {
Object val = m.get(pv.getName());
assertThat(val).as("Can't have unexpected value").isNotNull();
assertThat(val).as("Val i string").isInstanceOf(String.class);
assertThat(val.equals(pv.getValue())).as("val matches expected").isTrue();
assertThat(val).as("val matches expected").isEqualTo(pv.getValue());
m.remove(pv.getName());
}
assertThat(m.size()).as("Map size is 0").isEqualTo(0);