Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace assertThat(x.equals(y)) with assertThat(x).isEqualTo(y)

Browse Source 
Search for   : assertThat\((.+)\.equals\((\w+)\)\)\.isTrue\(\)
Replace with : assertThat($1).isEqualTo($2)

Search for   : assertThat\((.+)\.equals\((\w+)\)\)\.isFalse\(\)
Replace with : assertThat($1).isNotEqualTo($2)

Closes gh-31763
This commit is contained in:
Yanming Zhou
2023-12-06 14:44:43 +08:00
committed by Brian Clozel
parent e2852e7355
commit 7b16ef90f1
30 changed files with 151 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java
View File

@@ -1178,7 +1178,7 @@ public abstract class AbstractAopProxyTests {
assertThat(i2).isEqualTo(i1);
assertThat(proxyB).isEqualTo(proxyA);
assertThat(proxyB.hashCode()).isEqualTo(proxyA.hashCode());
assertThat(proxyA.equals(a)).isFalse();
assertThat(proxyA).isNotEqualTo(a);
// Equality checks were handled by the proxy
assertThat(i1.getCount()).isEqualTo(0);
@@ -1187,7 +1187,7 @@ public abstract class AbstractAopProxyTests {
// and won't think it's equal to B's NopInterceptor
proxyA.absquatulate();
assertThat(i1.getCount()).isEqualTo(1);
assertThat(proxyA.equals(proxyB)).isFalse();
assertThat(proxyA).isNotEqualTo(proxyB);
}
@Test

30
spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBeanMethodTests.java
View File

@@ -44,16 +44,16 @@ class ConfigurationClassAndBeanMethodTests {
ConfigurationClass configurationClass2 = newConfigurationClass(Config1.class);
ConfigurationClass configurationClass3 = newConfigurationClass(Config2.class);
assertThat(configurationClass1.equals(null)).isFalse();
assertThat(configurationClass1).isNotEqualTo(null);
assertThat(configurationClass1).isNotSameAs(configurationClass2);
assertThat(configurationClass1.equals(configurationClass1)).isTrue();
assertThat(configurationClass2.equals(configurationClass2)).isTrue();
assertThat(configurationClass1.equals(configurationClass2)).isTrue();
assertThat(configurationClass2.equals(configurationClass1)).isTrue();
assertThat(configurationClass1).isEqualTo(configurationClass1);
assertThat(configurationClass2).isEqualTo(configurationClass2);
assertThat(configurationClass1).isEqualTo(configurationClass2);
assertThat(configurationClass2).isEqualTo(configurationClass1);
assertThat(configurationClass1.equals(configurationClass3)).isFalse();
assertThat(configurationClass3.equals(configurationClass2)).isFalse();
assertThat(configurationClass1).isNotEqualTo(configurationClass3);
assertThat(configurationClass3).isNotEqualTo(configurationClass2);
// ---------------------------------------------------------------------
@@ -72,18 +72,18 @@ class ConfigurationClassAndBeanMethodTests {
BeanMethod beanMethod_3_1 = beanMethods3.get(1);
BeanMethod beanMethod_3_2 = beanMethods3.get(2);
assertThat(beanMethod_1_0.equals(null)).isFalse();
assertThat(beanMethod_1_0).isNotEqualTo(null);
assertThat(beanMethod_1_0).isNotSameAs(beanMethod_2_0);
assertThat(beanMethod_1_0.equals(beanMethod_1_0)).isTrue();
assertThat(beanMethod_1_0.equals(beanMethod_2_0)).isTrue();
assertThat(beanMethod_1_1.equals(beanMethod_2_1)).isTrue();
assertThat(beanMethod_1_2.equals(beanMethod_2_2)).isTrue();
assertThat(beanMethod_1_0).isEqualTo(beanMethod_1_0);
assertThat(beanMethod_1_0).isEqualTo(beanMethod_2_0);
assertThat(beanMethod_1_1).isEqualTo(beanMethod_2_1);
assertThat(beanMethod_1_2).isEqualTo(beanMethod_2_2);
assertThat(beanMethod_1_0.getMetadata().getMethodName()).isEqualTo(beanMethod_3_0.getMetadata().getMethodName());
assertThat(beanMethod_1_0.equals(beanMethod_3_0)).isFalse();
assertThat(beanMethod_1_1.equals(beanMethod_3_1)).isFalse();
assertThat(beanMethod_1_2.equals(beanMethod_3_2)).isFalse();
assertThat(beanMethod_1_0).isNotEqualTo(beanMethod_3_0);
assertThat(beanMethod_1_1).isNotEqualTo(beanMethod_3_1);
assertThat(beanMethod_1_2).isNotEqualTo(beanMethod_3_2);
}
@Test

2
spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java
View File

@@ -210,7 +210,7 @@ class ConfigurationClassProcessingTests {
BeanFactory factory = initBeanFactory(ConfigWithNullReference.class);
TestBean foo = factory.getBean("foo", TestBean.class);
assertThat(factory.getBean("bar").equals(null)).isTrue();
assertThat(factory.getBean("bar")).isEqualTo(null);
assertThat(foo.getSpouse()).isNull();
}

2
spring-context/src/test/java/org/springframework/context/expression/AnnotatedElementKeyTests.java
View File

@@ -67,7 +67,7 @@ class AnnotatedElementKeyTests {
AnnotatedElementKey first = new AnnotatedElementKey(this.method, getClass());
AnnotatedElementKey second = new AnnotatedElementKey(this.method, null);
assertThat(first.equals(second)).isFalse();
assertThat(first).isNotEqualTo(second);
}
private void assertKeyEquals(AnnotatedElementKey first, AnnotatedElementKey second) {

14
spring-context/src/test/java/org/springframework/scheduling/support/PeriodicTriggerTests.java
View File

@@ -185,25 +185,25 @@ class PeriodicTriggerTests {
PeriodicTrigger trigger1 = new PeriodicTrigger(Duration.ofMillis(3000));
PeriodicTrigger trigger2 = new PeriodicTrigger(Duration.ofMillis(3000));
assertThat(trigger1.equals(new String("not a trigger"))).isFalse();
assertThat(trigger1.equals(null)).isFalse();
assertThat(trigger1).isNotEqualTo(null);
assertThat(trigger1).isEqualTo(trigger1);
assertThat(trigger2).isEqualTo(trigger2);
assertThat(trigger2).isEqualTo(trigger1);
trigger2.setInitialDelay(1234);
assertThat(trigger1.equals(trigger2)).isFalse();
assertThat(trigger2.equals(trigger1)).isFalse();
assertThat(trigger1).isNotEqualTo(trigger2);
assertThat(trigger2).isNotEqualTo(trigger1);
trigger1.setInitialDelay(1234);
assertThat(trigger2).isEqualTo(trigger1);
trigger2.setFixedRate(true);
assertThat(trigger1.equals(trigger2)).isFalse();
assertThat(trigger2.equals(trigger1)).isFalse();
assertThat(trigger1).isNotEqualTo(trigger2);
assertThat(trigger2).isNotEqualTo(trigger1);
trigger1.setFixedRate(true);
assertThat(trigger2).isEqualTo(trigger1);
PeriodicTrigger trigger3 = new PeriodicTrigger(Duration.ofSeconds(3));
trigger3.setInitialDelay(Duration.ofSeconds(7));
trigger3.setFixedRate(true);
assertThat(trigger1.equals(trigger3)).isFalse();
assertThat(trigger3.equals(trigger1)).isFalse();
assertThat(trigger1).isNotEqualTo(trigger3);
assertThat(trigger3).isNotEqualTo(trigger1);
trigger1.setInitialDelay(Duration.ofMillis(7000));
assertThat(trigger3).isEqualTo(trigger1);
}