From 2ce21f765471736433e11af57299bc0c4c030263 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Thu, 19 Mar 2026 16:32:55 +0100 Subject: [PATCH] Convert assertThat(x.equals(y)).isFalse() to assertThat(x).isNotEqualTo(y) Search: assertThat\((?!\s*Arrays\.)(.+?)\.equals\((.+?)\)\)(.*?)\.isFalse\(\) Replace: assertThat($1)$3.isNotEqualTo($2) See gh-36504 --- .../target/dynamic/RefreshableTargetSourceTests.java | 4 ++-- .../factory/xml/AbstractBeanFactoryTests.java | 2 +- .../springframework/mail/SimpleMailMessageTests.java | 4 ++-- .../springframework/core/ResolvableTypeTests.java | 4 ++-- .../org/springframework/util/CompositeSetTests.java | 6 +++--- .../org/springframework/util/FilteredSetTests.java | 4 ++-- .../mock/web/MockHttpServletRequestTests.java | 2 +- .../org/springframework/http/HttpEntityTests.java | 12 ++++++------ 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java index 69bc51b4a1a..31f60744387 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java @@ -95,7 +95,7 @@ class RefreshableTargetSourceTests { Object d = ts.getTarget(); assertThat(d).as("D should not be null").isNotNull(); - assertThat(a.equals(d)).as("A and D should not be equal").isFalse(); + assertThat(a).as("A and D should not be equal").isNotEqualTo(d); Object e = ts.getTarget(); assertThat(e).as("D and E should be equal").isEqualTo(d); @@ -103,7 +103,7 @@ class RefreshableTargetSourceTests { Thread.sleep(110); Object f = ts.getTarget(); - assertThat(e.equals(f)).as("E and F should be different").isFalse(); + assertThat(e).as("E and F should be different").isNotEqualTo(f); } diff --git a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/factory/xml/AbstractBeanFactoryTests.java b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/factory/xml/AbstractBeanFactoryTests.java index af7d8b5a4b4..f08e1bd13ac 100644 --- a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/factory/xml/AbstractBeanFactoryTests.java +++ b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/factory/xml/AbstractBeanFactoryTests.java @@ -160,7 +160,7 @@ public abstract class AbstractBeanFactoryTests { tb2.setAge(2); assertThat(tb1.getAge()).as("1 age independent = 1").isEqualTo(1); assertThat(tb2.getAge()).as("2 age independent = 2").isEqualTo(2); - assertThat(tb1.equals(tb2)).as("object equal now false").isFalse(); + assertThat(tb1).as("object equal now false").isNotEqualTo(tb2); } @Test diff --git a/spring-context-support/src/test/java/org/springframework/mail/SimpleMailMessageTests.java b/spring-context-support/src/test/java/org/springframework/mail/SimpleMailMessageTests.java index c6d0e93acfb..976f8abfbb4 100644 --- a/spring-context-support/src/test/java/org/springframework/mail/SimpleMailMessageTests.java +++ b/spring-context-support/src/test/java/org/springframework/mail/SimpleMailMessageTests.java @@ -133,10 +133,10 @@ class SimpleMailMessageTests { // Null object is not equal message1 = new SimpleMailMessage(); message2 = null; - assertThat(message1.equals(message2)).isFalse(); + assertThat(message1).isNotEqualTo(message2); // Different class is not equal - assertThat(message1.equals(new Object())).isFalse(); + assertThat(message1).isNotEqualTo(new Object()); // Equal values are equal message1 = new SimpleMailMessage(); diff --git a/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java b/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java index c01ade2347b..c49613f7fce 100644 --- a/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java +++ b/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java @@ -1257,8 +1257,8 @@ class ResolvableTypeTests { ResolvableType arg2 = ResolvableType.forMethodParameter(method, 2, ClassArguments.class); assertThat(returnType.getType().equals(arg0.as(Class.class).getGeneric(0).getType())).isTrue(); - assertThat(returnType.getType().equals(arg1.as(Class.class).getGeneric(0).getType())).isFalse(); - assertThat(returnType.getType().equals(arg2.as(Class.class).getGeneric(0).getType())).isFalse(); + assertThat(returnType.getType()).isNotEqualTo(arg1.as(Class.class).getGeneric(0).getType()); + assertThat(returnType.getType()).isNotEqualTo(arg2.as(Class.class).getGeneric(0).getType()); } @Test diff --git a/spring-core/src/test/java/org/springframework/util/CompositeSetTests.java b/spring-core/src/test/java/org/springframework/util/CompositeSetTests.java index a144b63bbce..5210756a255 100644 --- a/spring-core/src/test/java/org/springframework/util/CompositeSetTests.java +++ b/spring-core/src/test/java/org/springframework/util/CompositeSetTests.java @@ -39,9 +39,9 @@ class CompositeSetTests { all.addAll(second); assertThat(composite.equals(all)).isTrue(); - assertThat(composite.equals(first)).isFalse(); - assertThat(composite.equals(second)).isFalse(); - assertThat(composite.equals(Collections.emptySet())).isFalse(); + assertThat(composite).isNotEqualTo(first); + assertThat(composite).isNotEqualTo(second); + assertThat(composite).isNotEqualTo(Collections.emptySet()); } } diff --git a/spring-core/src/test/java/org/springframework/util/FilteredSetTests.java b/spring-core/src/test/java/org/springframework/util/FilteredSetTests.java index 52a0cf98f10..b760d1cd10a 100644 --- a/spring-core/src/test/java/org/springframework/util/FilteredSetTests.java +++ b/spring-core/src/test/java/org/springframework/util/FilteredSetTests.java @@ -36,7 +36,7 @@ class FilteredSetTests { Set expected = Set.of("foo", "baz"); assertThat(filtered.equals(expected)).isTrue(); - assertThat(filtered.equals(set)).isFalse(); - assertThat(filtered.equals(Collections.emptySet())).isFalse(); + assertThat(filtered).isNotEqualTo(set); + assertThat(filtered).isNotEqualTo(Collections.emptySet()); } } diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java index f2e2fa7f5a2..e416e3fb44d 100644 --- a/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java +++ b/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java @@ -356,7 +356,7 @@ class MockHttpServletRequestTests { Locale.setDefault(newDefaultLocale); // Create the request after changing the default locale. MockHttpServletRequest request = new MockHttpServletRequest(); - assertThat(newDefaultLocale.equals(request.getLocale())).isFalse(); + assertThat(newDefaultLocale).isNotEqualTo(request.getLocale()); assertThat(request.getLocale()).isEqualTo(Locale.ENGLISH); } finally { diff --git a/spring-web/src/test/java/org/springframework/http/HttpEntityTests.java b/spring-web/src/test/java/org/springframework/http/HttpEntityTests.java index a62364a430f..47fb15c1b1d 100644 --- a/spring-web/src/test/java/org/springframework/http/HttpEntityTests.java +++ b/spring-web/src/test/java/org/springframework/http/HttpEntityTests.java @@ -72,18 +72,18 @@ class HttpEntityTests { headers2.set("Content-Type", "application/json"); assertThat(new HttpEntity<>().equals(new HttpEntity<>())).isTrue(); - assertThat(new HttpEntity<>(headers1).equals(new HttpEntity<>())).isFalse(); - assertThat(new HttpEntity<>().equals(new HttpEntity<>(headers2))).isFalse(); + 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).equals(new HttpEntity<>(headers2))).isFalse(); + assertThat(new HttpEntity<>(headers1)).isNotEqualTo(new HttpEntity<>(headers2)); assertThat(new HttpEntity(null, (HttpHeaders) null).equals(new HttpEntity<>(null, (HttpHeaders) null))).isTrue(); - assertThat(new HttpEntity<>("foo", (HttpHeaders) null).equals(new HttpEntity<>(null, (HttpHeaders) null))).isFalse(); - assertThat(new HttpEntity(null, (HttpHeaders) null).equals(new HttpEntity<>("bar", (HttpHeaders) null))).isFalse(); + assertThat(new HttpEntity<>("foo", (HttpHeaders) null)).isNotEqualTo(new HttpEntity<>(null, (HttpHeaders) null)); + assertThat(new HttpEntity(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).equals(new HttpEntity<>("bar", headers1))).isFalse(); + assertThat(new HttpEntity<>("foo", headers1)).isNotEqualTo(new HttpEntity<>("bar", headers1)); } @Test