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

Replace assertThat(x.contains(y)).isTrue() with assertThat(x).contains(y)

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

Search for   : assertThat\((.+)\.contains\((.+)\)\)\.isFalse\(\)
Replace with : assertThat($1).doesNotContain($2)

Closes gh-31762
This commit is contained in:
Yanming Zhou
2023-12-06 12:45:06 +08:00
committed by Brian Clozel
parent 1a63257b12
commit e2852e7355
39 changed files with 234 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java
View File

@@ -1143,12 +1143,12 @@ abstract class AbstractPropertyAccessorTests {
assertThat(target.getSet()).hasSize(1);
assertThat(target.getSet().contains("set1")).isTrue();
assertThat(target.getSortedSet()).hasSize(1);
assertThat(target.getSortedSet().contains("sortedSet1")).isTrue();
assertThat(target.getSortedSet()).contains("sortedSet1");
assertThat(target.getList()).hasSize(1);
assertThat(target.getList().contains("list1")).isTrue();
assertThat(target.getList()).contains("list1");
accessor.setPropertyValue("list", Collections.singletonList("list1 "));
assertThat(target.getList().contains("list1")).isTrue();
assertThat(target.getList()).contains("list1");
}
@Test

18
spring-beans/src/test/java/org/springframework/beans/BeanWrapperEnumTests.java
View File

@@ -92,7 +92,7 @@ public class BeanWrapperEnumTests {
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setPropertyValue("customEnumSet", "VALUE_1");
assertThat(gb.getCustomEnumSet()).hasSize(1);
assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_1)).isTrue();
assertThat(gb.getCustomEnumSet()).contains(CustomEnum.VALUE_1);
}
@Test
@@ -101,8 +101,8 @@ public class BeanWrapperEnumTests {
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setPropertyValue("customEnumSet", new String[] {"VALUE_1", "VALUE_2"});
assertThat(gb.getCustomEnumSet()).hasSize(2);
assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_1)).isTrue();
assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_2)).isTrue();
assertThat(gb.getCustomEnumSet()).contains(CustomEnum.VALUE_1);
assertThat(gb.getCustomEnumSet()).contains(CustomEnum.VALUE_2);
}
@Test
@@ -111,8 +111,8 @@ public class BeanWrapperEnumTests {
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setPropertyValue("customEnumSet", "VALUE_1,VALUE_2");
assertThat(gb.getCustomEnumSet()).hasSize(2);
assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_1)).isTrue();
assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_2)).isTrue();
assertThat(gb.getCustomEnumSet()).contains(CustomEnum.VALUE_1);
assertThat(gb.getCustomEnumSet()).contains(CustomEnum.VALUE_2);
}
@Test
@@ -121,8 +121,8 @@ public class BeanWrapperEnumTests {
BeanWrapper bw = new BeanWrapperImpl(gb);
bw.setPropertyValue("customEnumSetMismatch", new String[] {"VALUE_1", "VALUE_2"});
assertThat(gb.getCustomEnumSet()).hasSize(2);
assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_1)).isTrue();
assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_2)).isTrue();
assertThat(gb.getCustomEnumSet()).contains(CustomEnum.VALUE_1);
assertThat(gb.getCustomEnumSet()).contains(CustomEnum.VALUE_2);
}
@Test
@@ -133,8 +133,8 @@ public class BeanWrapperEnumTests {
assertThat(gb.getStandardEnumSet()).isNull();
bw.setPropertyValue("standardEnumSet", new String[] {"VALUE_1", "VALUE_2"});
assertThat(gb.getStandardEnumSet()).hasSize(2);
assertThat(gb.getStandardEnumSet().contains(CustomEnum.VALUE_1)).isTrue();
assertThat(gb.getStandardEnumSet().contains(CustomEnum.VALUE_2)).isTrue();
assertThat(gb.getStandardEnumSet()).contains(CustomEnum.VALUE_1);
assertThat(gb.getStandardEnumSet()).contains(CustomEnum.VALUE_2);
}
@Test

4
spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java
View File

@@ -58,8 +58,8 @@ class BeanWrapperGenericsTests {
input.add("4");
input.add("5");
bw.setPropertyValue("integerSet", input);
assertThat(gb.getIntegerSet().contains(4)).isTrue();
assertThat(gb.getIntegerSet().contains(5)).isTrue();
assertThat(gb.getIntegerSet()).contains(4);
assertThat(gb.getIntegerSet()).contains(5);
}
@Test

16
spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java
View File

@@ -112,7 +112,7 @@ public class BeanFactoryUtilsTests {
List<String> names = Arrays.asList(
BeanFactoryUtils.beanNamesForTypeIncludingAncestors(this.listableBeanFactory, IndexedTestBean.class));
assertThat(names).hasSize(1);
assertThat(names.contains("indexedBean")).isTrue();
assertThat(names).contains("indexedBean");
// Distinguish from default ListableBeanFactory behavior
assertThat(listableBeanFactory.getBeanNamesForType(IndexedTestBean.class)).isEmpty();
}
@@ -123,10 +123,10 @@ public class BeanFactoryUtilsTests {
BeanFactoryUtils.beanNamesForTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class));
// includes 2 TestBeans from FactoryBeans (DummyFactory definitions)
assertThat(names).hasSize(4);
assertThat(names.contains("test")).isTrue();
assertThat(names.contains("test3")).isTrue();
assertThat(names.contains("testFactory1")).isTrue();
assertThat(names.contains("testFactory2")).isTrue();
assertThat(names).contains("test");
assertThat(names).contains("test3");
assertThat(names).contains("testFactory1");
assertThat(names).contains("testFactory2");
}
@Test
@@ -282,7 +282,7 @@ public class BeanFactoryUtilsTests {
List<String> names = Arrays.asList(
BeanFactoryUtils.beanNamesForAnnotationIncludingAncestors(this.listableBeanFactory, TestAnnotation.class));
assertThat(names).hasSize(1);
assertThat(names.contains("annotatedBean")).isTrue();
assertThat(names).contains("annotatedBean");
// Distinguish from default ListableBeanFactory behavior
assertThat(listableBeanFactory.getBeanNamesForAnnotation(TestAnnotation.class)).isEmpty();
}
@@ -294,8 +294,8 @@ public class BeanFactoryUtilsTests {
List<String> names = Arrays.asList(
BeanFactoryUtils.beanNamesForAnnotationIncludingAncestors(this.listableBeanFactory, TestAnnotation.class));
assertThat(names).hasSize(2);
assertThat(names.contains("annotatedBean")).isTrue();
assertThat(names.contains("anotherAnnotatedBean")).isTrue();
assertThat(names).contains("annotatedBean");
assertThat(names).contains("anotherAnnotatedBean");
}
@Test

24
spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
View File

@@ -1845,19 +1845,19 @@ class DefaultListableBeanFactoryTests {
resolved.add(instance);
}
assertThat(resolved).hasSize(2);
assertThat(resolved.contains(lbf.getBean("bd1"))).isTrue();
assertThat(resolved.contains(lbf.getBean("bd2"))).isTrue();
assertThat(resolved).contains(lbf.getBean("bd1"));
assertThat(resolved).contains(lbf.getBean("bd2"));
resolved = new HashSet<>();
provider.forEach(resolved::add);
assertThat(resolved).hasSize(2);
assertThat(resolved.contains(lbf.getBean("bd1"))).isTrue();
assertThat(resolved.contains(lbf.getBean("bd2"))).isTrue();
assertThat(resolved).contains(lbf.getBean("bd1"));
assertThat(resolved).contains(lbf.getBean("bd2"));
resolved = provider.stream().collect(Collectors.toSet());
assertThat(resolved).hasSize(2);
assertThat(resolved.contains(lbf.getBean("bd1"))).isTrue();
assertThat(resolved.contains(lbf.getBean("bd2"))).isTrue();
assertThat(resolved).contains(lbf.getBean("bd1"));
assertThat(resolved).contains(lbf.getBean("bd2"));
}
@Test
@@ -1894,19 +1894,19 @@ class DefaultListableBeanFactoryTests {
resolved.add(instance);
}
assertThat(resolved).hasSize(2);
assertThat(resolved.contains(lbf.getBean("bd1"))).isTrue();
assertThat(resolved.contains(lbf.getBean("bd2"))).isTrue();
assertThat(resolved).contains(lbf.getBean("bd1"));
assertThat(resolved).contains(lbf.getBean("bd2"));
resolved = new HashSet<>();
provider.forEach(resolved::add);
assertThat(resolved).hasSize(2);
assertThat(resolved.contains(lbf.getBean("bd1"))).isTrue();
assertThat(resolved.contains(lbf.getBean("bd2"))).isTrue();
assertThat(resolved).contains(lbf.getBean("bd1"));
assertThat(resolved).contains(lbf.getBean("bd2"));
resolved = provider.stream().collect(Collectors.toSet());
assertThat(resolved).hasSize(2);
assertThat(resolved.contains(lbf.getBean("bd1"))).isTrue();
assertThat(resolved.contains(lbf.getBean("bd2"))).isTrue();
assertThat(resolved).contains(lbf.getBean("bd1"));
assertThat(resolved).contains(lbf.getBean("bd2"));
}
@Test

20
spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
View File

@@ -1610,18 +1610,18 @@ public class AutowiredAnnotationBeanPostProcessorTests {
assertThat(bean.getUniqueTestBeanWithDefault()).isEqualTo(bf.getBean("testBean"));
assertThat(bean.consumeUniqueTestBean()).isEqualTo(bf.getBean("testBean"));
List<?> testBeans = bean.iterateTestBeans();
List<TestBean> testBeans = bean.iterateTestBeans();
assertThat(testBeans).hasSize(1);
assertThat(testBeans.contains(bf.getBean("testBean"))).isTrue();
assertThat(testBeans).contains(bf.getBean("testBean", TestBean.class));
testBeans = bean.forEachTestBeans();
assertThat(testBeans).hasSize(1);
assertThat(testBeans.contains(bf.getBean("testBean"))).isTrue();
assertThat(testBeans).contains(bf.getBean("testBean", TestBean.class));
testBeans = bean.streamTestBeans();
assertThat(testBeans).hasSize(1);
assertThat(testBeans.contains(bf.getBean("testBean"))).isTrue();
assertThat(testBeans).contains(bf.getBean("testBean", TestBean.class));
testBeans = bean.sortedTestBeans();
assertThat(testBeans).hasSize(1);
assertThat(testBeans.contains(bf.getBean("testBean"))).isTrue();
assertThat(testBeans).contains(bf.getBean("testBean", TestBean.class));
}
@Test
@@ -1638,18 +1638,18 @@ public class AutowiredAnnotationBeanPostProcessorTests {
assertThat(bean.getUniqueTestBeanWithDefault()).isSameAs(bf.getBean("testBean"));
assertThat(bean.consumeUniqueTestBean()).isEqualTo(bf.getBean("testBean"));
List<?> testBeans = bean.iterateTestBeans();
List<TestBean> testBeans = bean.iterateTestBeans();
assertThat(testBeans).hasSize(1);
assertThat(testBeans.contains(bf.getBean("testBean"))).isTrue();
assertThat(testBeans).contains(bf.getBean("testBean", TestBean.class));
testBeans = bean.forEachTestBeans();
assertThat(testBeans).hasSize(1);
assertThat(testBeans.contains(bf.getBean("testBean"))).isTrue();
assertThat(testBeans).contains(bf.getBean("testBean", TestBean.class));
testBeans = bean.streamTestBeans();
assertThat(testBeans).hasSize(1);
assertThat(testBeans.contains(bf.getBean("testBean"))).isTrue();
assertThat(testBeans).contains(bf.getBean("testBean", TestBean.class));
testBeans = bean.sortedTestBeans();
assertThat(testBeans).hasSize(1);
assertThat(testBeans.contains(bf.getBean("testBean"))).isTrue();
assertThat(testBeans).contains(bf.getBean("testBean", TestBean.class));
}
@Test

16
spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java
View File

@@ -199,8 +199,8 @@ public class FactoryMethodTests {
assertThat(xbf.getType("externalFactoryMethodWithoutArgs")).isEqualTo(TestBean.class);
assertThat(xbf.getType("externalFactoryMethodWithArgs")).isEqualTo(TestBean.class);
String[] names = xbf.getBeanNamesForType(TestBean.class);
assertThat(Arrays.asList(names).contains("externalFactoryMethodWithoutArgs")).isTrue();
assertThat(Arrays.asList(names).contains("externalFactoryMethodWithArgs")).isTrue();
assertThat(Arrays.asList(names)).contains("externalFactoryMethodWithoutArgs");
assertThat(Arrays.asList(names)).contains("externalFactoryMethodWithArgs");
TestBean tb = (TestBean) xbf.getBean("externalFactoryMethodWithoutArgs");
assertThat(tb.getAge()).isEqualTo(2);
@@ -212,8 +212,8 @@ public class FactoryMethodTests {
assertThat(xbf.getType("externalFactoryMethodWithoutArgs")).isEqualTo(TestBean.class);
assertThat(xbf.getType("externalFactoryMethodWithArgs")).isEqualTo(TestBean.class);
names = xbf.getBeanNamesForType(TestBean.class);
assertThat(Arrays.asList(names).contains("externalFactoryMethodWithoutArgs")).isTrue();
assertThat(Arrays.asList(names).contains("externalFactoryMethodWithArgs")).isTrue();
assertThat(Arrays.asList(names)).contains("externalFactoryMethodWithoutArgs");
assertThat(Arrays.asList(names)).contains("externalFactoryMethodWithArgs");
}
@Test
@@ -337,16 +337,16 @@ public class FactoryMethodTests {
// Check that listInstance is not considered a bean of type FactoryMethods.
assertThat(List.class.isAssignableFrom(xbf.getType("listInstance"))).isTrue();
String[] names = xbf.getBeanNamesForType(FactoryMethods.class);
assertThat(Arrays.asList(names).contains("listInstance")).isFalse();
assertThat(Arrays.asList(names)).doesNotContain("listInstance");
names = xbf.getBeanNamesForType(List.class);
assertThat(Arrays.asList(names).contains("listInstance")).isTrue();
assertThat(Arrays.asList(names)).contains("listInstance");
xbf.preInstantiateSingletons();
assertThat(List.class.isAssignableFrom(xbf.getType("listInstance"))).isTrue();
names = xbf.getBeanNamesForType(FactoryMethods.class);
assertThat(Arrays.asList(names).contains("listInstance")).isFalse();
assertThat(Arrays.asList(names)).doesNotContain("listInstance");
names = xbf.getBeanNamesForType(List.class);
assertThat(Arrays.asList(names).contains("listInstance")).isTrue();
assertThat(Arrays.asList(names)).contains("listInstance");
List<?> list = (List<?>) xbf.getBean("listInstance");
assertThat(list).isEqualTo(Collections.EMPTY_LIST);
}

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

@@ -154,7 +154,7 @@ public class XmlBeanCollectionTests {
TestBean loner = (TestBean) this.beanFactory.getBean("loner");
TestBean dave = (TestBean) this.beanFactory.getBean("david");
assertThat(loner.getFriends().size()).isEqualTo(1);
assertThat(loner.getFriends().contains(dave)).isTrue();
assertThat(loner.getFriends()).contains(dave);
}
@Test
@@ -296,8 +296,8 @@ public class XmlBeanCollectionTests {
HasMap hasMap = (HasMap) this.beanFactory.getBean("identityMap");
assertThat(hasMap.getIdentityMap().size()).isEqualTo(2);
HashSet set = new HashSet(hasMap.getIdentityMap().keySet());
assertThat(set.contains("foo")).isTrue();
assertThat(set.contains("jenny")).isTrue();
assertThat(set).contains("foo");
assertThat(set).contains("jenny");
}
@Test
@@ -384,8 +384,8 @@ public class XmlBeanCollectionTests {
Set set = (Set) this.beanFactory.getBean("setFactory");
assertThat(set).isInstanceOf(TreeSet.class);
assertThat(set.size()).isEqualTo(2);
assertThat(set.contains("bar")).isTrue();
assertThat(set.contains("jenny")).isTrue();
assertThat(set).contains("bar");
assertThat(set).contains("jenny");
}
@Test
@@ -393,8 +393,8 @@ public class XmlBeanCollectionTests {
Set set = (Set) this.beanFactory.getBean("pSetFactory");
assertThat(set).isInstanceOf(TreeSet.class);
assertThat(set.size()).isEqualTo(2);
assertThat(set.contains("bar")).isTrue();
assertThat(set.contains("jenny")).isTrue();
assertThat(set).contains("bar");
assertThat(set).contains("jenny");
}
@Test
@@ -430,8 +430,8 @@ public class XmlBeanCollectionTests {
public void testEnumSetFactory() {
Set set = (Set) this.beanFactory.getBean("enumSetFactory");
assertThat(set.size()).isEqualTo(2);
assertThat(set.contains("ONE")).isTrue();
assertThat(set.contains("TWO")).isTrue();
assertThat(set).contains("ONE");
assertThat(set).contains("TWO");
}