Replace assertThat(x.contains(y)).isTrue() with assertThat(x).contains(y)
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:
committed by
Brian Clozel
parent
1a63257b12
commit
e2852e7355
@@ -39,8 +39,8 @@ public class ScopedProxyAutowireTests {
|
||||
new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
|
||||
qualifiedResource(ScopedProxyAutowireTests.class, "scopedAutowireFalse.xml"));
|
||||
|
||||
assertThat(Arrays.asList(bf.getBeanNamesForType(TestBean.class, false, false)).contains("scoped")).isTrue();
|
||||
assertThat(Arrays.asList(bf.getBeanNamesForType(TestBean.class, true, false)).contains("scoped")).isTrue();
|
||||
assertThat(Arrays.asList(bf.getBeanNamesForType(TestBean.class, false, false))).contains("scoped");
|
||||
assertThat(Arrays.asList(bf.getBeanNamesForType(TestBean.class, true, false))).contains("scoped");
|
||||
assertThat(bf.containsSingleton("scoped")).isFalse();
|
||||
TestBean autowired = (TestBean) bf.getBean("autowired");
|
||||
TestBean unscoped = (TestBean) bf.getBean("unscoped");
|
||||
@@ -53,8 +53,8 @@ public class ScopedProxyAutowireTests {
|
||||
new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
|
||||
qualifiedResource(ScopedProxyAutowireTests.class, "scopedAutowireTrue.xml"));
|
||||
|
||||
assertThat(Arrays.asList(bf.getBeanNamesForType(TestBean.class, true, false)).contains("scoped")).isTrue();
|
||||
assertThat(Arrays.asList(bf.getBeanNamesForType(TestBean.class, false, false)).contains("scoped")).isTrue();
|
||||
assertThat(Arrays.asList(bf.getBeanNamesForType(TestBean.class, true, false))).contains("scoped");
|
||||
assertThat(Arrays.asList(bf.getBeanNamesForType(TestBean.class, false, false))).contains("scoped");
|
||||
assertThat(bf.containsSingleton("scoped")).isFalse();
|
||||
TestBean autowired = (TestBean) bf.getBean("autowired");
|
||||
TestBean scoped = (TestBean) bf.getBean("scoped");
|
||||
|
||||
@@ -72,14 +72,14 @@ public class LazyInitTargetSourceTests {
|
||||
new XmlBeanDefinitionReader(bf).loadBeanDefinitions(FACTORY_BEAN_CONTEXT);
|
||||
bf.preInstantiateSingletons();
|
||||
|
||||
Set<?> set1 = (Set<?>) bf.getBean("proxy1");
|
||||
Set<Object> set1 = (Set<Object>) bf.getBean("proxy1");
|
||||
assertThat(bf.containsSingleton("target1")).isFalse();
|
||||
assertThat(set1.contains("10")).isTrue();
|
||||
assertThat(set1).contains("10");
|
||||
assertThat(bf.containsSingleton("target1")).isTrue();
|
||||
|
||||
Set<?> set2 = (Set<?>) bf.getBean("proxy2");
|
||||
Set<Object> set2 = (Set<Object>) bf.getBean("proxy2");
|
||||
assertThat(bf.containsSingleton("target2")).isFalse();
|
||||
assertThat(set2.contains("20")).isTrue();
|
||||
assertThat(set2).contains("20");
|
||||
assertThat(bf.containsSingleton("target2")).isTrue();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user