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

68
spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java
View File

@@ -35,13 +35,13 @@ public class BeanDefinitionTests {
bd.setLazyInit(true);
bd.setScope("request");
RootBeanDefinition otherBd = new RootBeanDefinition(TestBean.class);
assertThat(bd.equals(otherBd)).isFalse();
assertThat(otherBd.equals(bd)).isFalse();
assertThat(bd).isNotEqualTo(otherBd);
assertThat(otherBd).isNotEqualTo(bd);
otherBd.setAbstract(true);
otherBd.setLazyInit(true);
otherBd.setScope("request");
assertThat(bd.equals(otherBd)).isTrue();
assertThat(otherBd.equals(bd)).isTrue();
assertThat(bd).isEqualTo(otherBd);
assertThat(otherBd).isEqualTo(bd);
assertThat(bd.hashCode()).isEqualTo(otherBd.hashCode());
}
@@ -52,14 +52,14 @@ public class BeanDefinitionTests {
bd.getPropertyValues().add("age", "99");
RootBeanDefinition otherBd = new RootBeanDefinition(TestBean.class);
otherBd.getPropertyValues().add("name", "myName");
assertThat(bd.equals(otherBd)).isFalse();
assertThat(otherBd.equals(bd)).isFalse();
assertThat(bd).isNotEqualTo(otherBd);
assertThat(otherBd).isNotEqualTo(bd);
otherBd.getPropertyValues().add("age", "11");
assertThat(bd.equals(otherBd)).isFalse();
assertThat(otherBd.equals(bd)).isFalse();
assertThat(bd).isNotEqualTo(otherBd);
assertThat(otherBd).isNotEqualTo(bd);
otherBd.getPropertyValues().add("age", "99");
assertThat(bd.equals(otherBd)).isTrue();
assertThat(otherBd.equals(bd)).isTrue();
assertThat(bd).isEqualTo(otherBd);
assertThat(otherBd).isEqualTo(bd);
assertThat(bd.hashCode()).isEqualTo(otherBd.hashCode());
}
@@ -70,14 +70,14 @@ public class BeanDefinitionTests {
bd.getConstructorArgumentValues().addIndexedArgumentValue(1, 5);
RootBeanDefinition otherBd = new RootBeanDefinition(TestBean.class);
otherBd.getConstructorArgumentValues().addGenericArgumentValue("test");
assertThat(bd.equals(otherBd)).isFalse();
assertThat(otherBd.equals(bd)).isFalse();
assertThat(bd).isNotEqualTo(otherBd);
assertThat(otherBd).isNotEqualTo(bd);
otherBd.getConstructorArgumentValues().addIndexedArgumentValue(1, 9);
assertThat(bd.equals(otherBd)).isFalse();
assertThat(otherBd.equals(bd)).isFalse();
assertThat(bd).isNotEqualTo(otherBd);
assertThat(otherBd).isNotEqualTo(bd);
otherBd.getConstructorArgumentValues().addIndexedArgumentValue(1, 5);
assertThat(bd.equals(otherBd)).isTrue();
assertThat(otherBd.equals(bd)).isTrue();
assertThat(bd).isEqualTo(otherBd);
assertThat(otherBd).isEqualTo(bd);
assertThat(bd.hashCode()).isEqualTo(otherBd.hashCode());
}
@@ -89,14 +89,14 @@ public class BeanDefinitionTests {
RootBeanDefinition otherBd = new RootBeanDefinition(TestBean.class);
otherBd.getConstructorArgumentValues().addGenericArgumentValue("test", "int");
otherBd.getConstructorArgumentValues().addIndexedArgumentValue(1, 5);
assertThat(bd.equals(otherBd)).isFalse();
assertThat(otherBd.equals(bd)).isFalse();
assertThat(bd).isNotEqualTo(otherBd);
assertThat(otherBd).isNotEqualTo(bd);
otherBd.getConstructorArgumentValues().addIndexedArgumentValue(1, 5, "int");
assertThat(bd.equals(otherBd)).isFalse();
assertThat(otherBd.equals(bd)).isFalse();
assertThat(bd).isNotEqualTo(otherBd);
assertThat(otherBd).isNotEqualTo(bd);
otherBd.getConstructorArgumentValues().addIndexedArgumentValue(1, 5, "long");
assertThat(bd.equals(otherBd)).isTrue();
assertThat(otherBd.equals(bd)).isTrue();
assertThat(bd).isEqualTo(otherBd);
assertThat(otherBd).isEqualTo(bd);
assertThat(bd.hashCode()).isEqualTo(otherBd.hashCode());
}
@@ -111,21 +111,21 @@ public class BeanDefinitionTests {
otherBd.setScope("request");
otherBd.setAbstract(true);
otherBd.setLazyInit(true);
assertThat(bd.equals(otherBd)).isFalse();
assertThat(otherBd.equals(bd)).isFalse();
assertThat(bd).isNotEqualTo(otherBd);
assertThat(otherBd).isNotEqualTo(bd);
otherBd.setParentName("parent");
assertThat(bd.equals(otherBd)).isTrue();
assertThat(otherBd.equals(bd)).isTrue();
assertThat(bd).isEqualTo(otherBd);
assertThat(otherBd).isEqualTo(bd);
assertThat(bd.hashCode()).isEqualTo(otherBd.hashCode());
bd.getPropertyValues();
assertThat(bd.equals(otherBd)).isTrue();
assertThat(otherBd.equals(bd)).isTrue();
assertThat(bd).isEqualTo(otherBd);
assertThat(otherBd).isEqualTo(bd);
assertThat(bd.hashCode()).isEqualTo(otherBd.hashCode());
bd.getConstructorArgumentValues();
assertThat(bd.equals(otherBd)).isTrue();
assertThat(otherBd.equals(bd)).isTrue();
assertThat(bd).isEqualTo(otherBd);
assertThat(otherBd).isEqualTo(bd);
assertThat(bd.hashCode()).isEqualTo(otherBd.hashCode());
}
@@ -137,14 +137,14 @@ public class BeanDefinitionTests {
bd.setScope("request");
BeanDefinitionHolder holder = new BeanDefinitionHolder(bd, "bd");
RootBeanDefinition otherBd = new RootBeanDefinition(TestBean.class);
assertThat(bd.equals(otherBd)).isFalse();
assertThat(otherBd.equals(bd)).isFalse();
assertThat(bd).isNotEqualTo(otherBd);
assertThat(otherBd).isNotEqualTo(bd);
otherBd.setAbstract(true);
otherBd.setLazyInit(true);
otherBd.setScope("request");
BeanDefinitionHolder otherHolder = new BeanDefinitionHolder(bd, "bd");
assertThat(holder.equals(otherHolder)).isTrue();
assertThat(otherHolder.equals(holder)).isTrue();
assertThat(holder).isEqualTo(otherHolder);
assertThat(otherHolder).isEqualTo(holder);
assertThat(holder.hashCode()).isEqualTo(otherHolder.hashCode());
}

4
spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java
View File

@@ -85,8 +85,8 @@ public class CollectionsWithDefaultTypesTests {
List l = (List) jumble.getJumble();
assertThat(l.get(0).equals("literal")).isTrue();
Integer[] array1 = (Integer[]) l.get(1);
assertThat(array1[0].equals(2)).isTrue();
assertThat(array1[1].equals(4)).isTrue();
assertThat(array1[0]).isEqualTo(2);
assertThat(array1[1]).isEqualTo(4);
int[] array2 = (int[]) l.get(2);
assertThat(array2[0]).isEqualTo(3);
assertThat(array2[1]).isEqualTo(5);

10
spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java
View File

@@ -198,14 +198,14 @@ public class XmlBeanCollectionTests {
public void testMapWithLiteralsAndReferences() {
HasMap hasMap = (HasMap) this.beanFactory.getBean("mixedMap");
assertThat(hasMap.getMap().size()).isEqualTo(5);
assertThat(hasMap.getMap().get("foo").equals(10)).isTrue();
assertThat(hasMap.getMap().get("foo")).isEqualTo(10);
TestBean jenny = (TestBean) this.beanFactory.getBean("jenny");
assertThat(hasMap.getMap().get("jenny")).isSameAs(jenny);
assertThat(hasMap.getMap().get(5).equals("david")).isTrue();
assertThat(hasMap.getMap().get("bar")).isInstanceOf(Long.class);
assertThat(hasMap.getMap().get("bar").equals(100L)).isTrue();
assertThat(hasMap.getMap().get("bar")).isEqualTo(100L);
assertThat(hasMap.getMap().get("baz")).isInstanceOf(Integer.class);
assertThat(hasMap.getMap().get("baz").equals(200)).isTrue();
assertThat(hasMap.getMap().get("baz")).isEqualTo(200);
}
@Test
@@ -230,7 +230,7 @@ public class XmlBeanCollectionTests {
assertThat(hasMap.getMap().size()).isEqualTo(4);
assertThat(hasMap.getMap().get(null).equals("bar")).isTrue();
TestBean jenny = (TestBean) this.beanFactory.getBean("jenny");
assertThat(hasMap.getMap().get("jenny").equals(jenny)).isTrue();
assertThat(hasMap.getMap().get("jenny")).isEqualTo(jenny);
// Check list
List l = (List) hasMap.getMap().get("list");
@@ -250,7 +250,7 @@ public class XmlBeanCollectionTests {
l = (List) l.get(2);
assertThat(l).isNotNull();
assertThat(l.size()).isEqualTo(2);
assertThat(l.get(0).equals(jenny)).isTrue();
assertThat(l.get(0)).isEqualTo(jenny);
assertThat(l.get(1).equals("ba")).isTrue();
// Check nested map