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

Use AssertJ's hasSize() for collections and maps

Browse Source 
Achieved via a global search-and-replace.
This commit is contained in:
Sam Brannen
2022-11-22 16:50:10 +01:00
parent f9f8f2d89e
commit 36f7597f25
237 changed files with 1161 additions and 1172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1085,7 +1085,7 @@ public abstract class AbstractAopProxyTests {
it.setName(name2);
// NameReverter saved it back
assertThat(it.getName()).isEqualTo(name1);
assertThat(saver.names.size()).isEqualTo(2);
assertThat(saver.names).hasSize(2);
assertThat(saver.names.get(0)).isEqualTo(name2);
assertThat(saver.names.get(1)).isEqualTo(name1);
}

22
spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java
View File

@@ -203,7 +203,7 @@ class XmlBeanFactoryTests {
assertThat(inner5.getBeanName()).isEqualTo("innerBean#2");
assertThat(hasInnerBeans.getSomeMap()).isNotNull();
assertThat(hasInnerBeans.getSomeMap().size()).isEqualTo(2);
assertThat(hasInnerBeans.getSomeMap()).hasSize(2);
TestBean inner3 = (TestBean) hasInnerBeans.getSomeMap().get("someKey");
assertThat(inner3.getName()).isEqualTo("Jenny");
assertThat(inner3.getAge()).isEqualTo(30);
@@ -410,7 +410,7 @@ class XmlBeanFactoryTests {
// abstract beans should not match
Map<?, ?> tbs = parent.getBeansOfType(TestBean.class);
assertThat(tbs.size()).isEqualTo(2);
assertThat(tbs).hasSize(2);
assertThat(tbs.containsKey("inheritedTestBeanPrototype")).isTrue();
assertThat(tbs.containsKey("inheritedTestBeanSingleton")).isTrue();
@@ -427,13 +427,13 @@ class XmlBeanFactoryTests {
DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(DEP_MATERIALIZE_CONTEXT);
assertThat(xbf.getBeansOfType(DummyBo.class, true, false).size()).isEqualTo(2);
assertThat(xbf.getBeansOfType(DummyBo.class, true, true).size()).isEqualTo(3);
assertThat(xbf.getBeansOfType(DummyBo.class, true, false).size()).isEqualTo(3);
assertThat(xbf.getBeansOfType(DummyBo.class).size()).isEqualTo(3);
assertThat(xbf.getBeansOfType(DummyBoImpl.class, true, true).size()).isEqualTo(2);
assertThat(xbf.getBeansOfType(DummyBoImpl.class, false, true).size()).isEqualTo(1);
assertThat(xbf.getBeansOfType(DummyBoImpl.class).size()).isEqualTo(2);
assertThat(xbf.getBeansOfType(DummyBo.class, true, false)).hasSize(2);
assertThat(xbf.getBeansOfType(DummyBo.class, true, true)).hasSize(3);
assertThat(xbf.getBeansOfType(DummyBo.class, true, false)).hasSize(3);
assertThat(xbf.getBeansOfType(DummyBo.class)).hasSize(3);
assertThat(xbf.getBeansOfType(DummyBoImpl.class, true, true)).hasSize(2);
assertThat(xbf.getBeansOfType(DummyBoImpl.class, false, true)).hasSize(1);
assertThat(xbf.getBeansOfType(DummyBoImpl.class)).hasSize(2);
DummyBoImpl bos = (DummyBoImpl) xbf.getBean("boSingleton");
DummyBoImpl bop = (DummyBoImpl) xbf.getBean("boPrototype");
@@ -1389,12 +1389,12 @@ class XmlBeanFactoryTests {
reader.loadBeanDefinitions(OVERRIDES_CONTEXT);
TestBean jenny1 = (TestBean) xbf.getBean("jennyChild");
assertThat(jenny1.getFriends().size()).isEqualTo(1);
assertThat(jenny1.getFriends()).hasSize(1);
Object friend1 = jenny1.getFriends().iterator().next();
assertThat(friend1 instanceof TestBean).isTrue();
TestBean jenny2 = (TestBean) xbf.getBean("jennyChild");
assertThat(jenny2.getFriends().size()).isEqualTo(1);
assertThat(jenny2.getFriends()).hasSize(1);
Object friend2 = jenny2.getFriends().iterator().next();
assertThat(friend2 instanceof TestBean).isTrue();

6
spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java
View File

@@ -151,21 +151,21 @@ public class CustomNamespaceHandlerTests {
public void testCustomElementNestedWithinUtilList() throws Exception {
List<?> things = (List<?>) this.beanFactory.getBean("list.of.things");
assertThat(things).isNotNull();
assertThat(things.size()).isEqualTo(2);
assertThat(things).hasSize(2);
}
@Test // SPR-2728
public void testCustomElementNestedWithinUtilSet() throws Exception {
Set<?> things = (Set<?>) this.beanFactory.getBean("set.of.things");
assertThat(things).isNotNull();
assertThat(things.size()).isEqualTo(2);
assertThat(things).hasSize(2);
}
@Test // SPR-2728
public void testCustomElementNestedWithinUtilMap() throws Exception {
Map<?, ?> things = (Map<?, ?>) this.beanFactory.getBean("map.of.things");
assertThat(things).isNotNull();
assertThat(things.size()).isEqualTo(2);
assertThat(things).hasSize(2);
}

2
spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheTests.java vendored
View File

@@ -88,7 +88,7 @@ public class ConcurrentMapCacheTests extends AbstractValueAdaptingCacheTests<Con
serializeCache.put(key, content);
content.remove(0);
List<String> entry = (List<String>) serializeCache.get(key).get();
assertThat(entry.size()).isEqualTo(3);
assertThat(entry).hasSize(3);
assertThat(entry.get(0)).isEqualTo("one");
}

2
spring-context/src/test/java/org/springframework/cache/interceptor/ExpressionEvaluatorTests.java vendored
View File

@@ -61,7 +61,7 @@ public class ExpressionEvaluatorTests {
@Test
public void testMultipleCachingSource() {
Collection<CacheOperation> ops = getOps("multipleCaching");
assertThat(ops.size()).isEqualTo(2);
assertThat(ops).hasSize(2);
Iterator<CacheOperation> it = ops.iterator();
CacheOperation next = it.next();
assertThat(next instanceof CacheableOperation).isTrue();

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

@@ -465,7 +465,7 @@ public class ClassPathBeanDefinitionScannerTests {
assertThat(fooService.foo(123)).isEqualTo("bar");
assertThat(fooService.lookupFoo(123)).isEqualTo("bar");
assertThat(fooService.beanFactory).isSameAs(context.getDefaultListableBeanFactory());
assertThat(fooService.listableBeanFactory.size()).isEqualTo(2);
assertThat(fooService.listableBeanFactory).hasSize(2);
assertThat(fooService.listableBeanFactory.get(0)).isSameAs(context.getDefaultListableBeanFactory());
assertThat(fooService.listableBeanFactory.get(1)).isSameAs(myBf);
assertThat(fooService.resourceLoader).isSameAs(context);

32
spring-context/src/test/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProviderTests.java
View File

@@ -98,7 +98,7 @@ class ClassPathScanningCandidateComponentProviderTests {
assertThat(containsBeanClass(candidates, NamedStubDao.class)).isTrue();
assertThat(containsBeanClass(candidates, ServiceInvocationCounter.class)).isTrue();
assertThat(containsBeanClass(candidates, BarComponent.class)).isTrue();
assertThat(candidates.size()).isEqualTo(7);
assertThat(candidates).hasSize(7);
assertBeanDefinitionType(candidates);
}
@@ -120,7 +120,7 @@ class ClassPathScanningCandidateComponentProviderTests {
private void testAntStyle(ClassPathScanningCandidateComponentProvider provider) {
Set<BeanDefinition> candidates = provider.findCandidateComponents(TEST_BASE_PACKAGE + ".**.sub");
assertThat(containsBeanClass(candidates, BarComponent.class)).isTrue();
assertThat(candidates.size()).isEqualTo(1);
assertThat(candidates).hasSize(1);
assertBeanDefinitionType(candidates);
}
@@ -130,7 +130,7 @@ class ClassPathScanningCandidateComponentProviderTests {
provider.setResourceLoader(new DefaultResourceLoader(
CandidateComponentsTestClassLoader.disableIndex(getClass().getClassLoader())));
Set<BeanDefinition> candidates = provider.findCandidateComponents("bogus");
assertThat(candidates.size()).isEqualTo(0);
assertThat(candidates).hasSize(0);
}
@Test
@@ -138,7 +138,7 @@ class ClassPathScanningCandidateComponentProviderTests {
ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(true);
provider.setResourceLoader(new DefaultResourceLoader(TEST_BASE_CLASSLOADER));
Set<BeanDefinition> candidates = provider.findCandidateComponents("bogus");
assertThat(candidates.size()).isEqualTo(0);
assertThat(candidates).hasSize(0);
}
@Test
@@ -193,7 +193,7 @@ class ClassPathScanningCandidateComponentProviderTests {
assertThat(containsBeanClass(candidates, AutowiredQualifierFooService.class)).isTrue();
assertThat(containsBeanClass(candidates, FooServiceImpl.class)).isTrue();
assertThat(containsBeanClass(candidates, ScopedProxyTestBean.class)).isTrue();
assertThat(candidates.size()).isEqualTo(3);
assertThat(candidates).hasSize(3);
assertBeanDefinitionType(candidates);
}
@@ -220,7 +220,7 @@ class ClassPathScanningCandidateComponentProviderTests {
assertThat(containsBeanClass(candidates, NamedComponent.class)).isTrue();
assertThat(containsBeanClass(candidates, ServiceInvocationCounter.class)).isTrue();
assertThat(containsBeanClass(candidates, BarComponent.class)).isTrue();
assertThat(candidates.size()).isEqualTo(3);
assertThat(candidates).hasSize(3);
assertBeanDefinitionType(candidates);
}
@@ -233,7 +233,7 @@ class ClassPathScanningCandidateComponentProviderTests {
provider.addIncludeFilter(new AnnotationTypeFilter(CustomStereotype.class));
Set<BeanDefinition> candidates = provider.findCandidateComponents(TEST_BASE_PACKAGE);
assertThat(containsBeanClass(candidates, DefaultNamedComponent.class)).isTrue();
assertThat(candidates.size()).isEqualTo(1);
assertThat(candidates).hasSize(1);
assertBeanDefinitionType(candidates);
}
@@ -244,7 +244,7 @@ class ClassPathScanningCandidateComponentProviderTests {
provider.addIncludeFilter(new AssignableTypeFilter(FooDao.class));
Set<BeanDefinition> candidates = provider.findCandidateComponents(TEST_BASE_PACKAGE);
assertThat(containsBeanClass(candidates, StubFooDao.class)).isTrue();
assertThat(candidates.size()).isEqualTo(1);
assertThat(candidates).hasSize(1);
assertBeanDefinitionType(candidates);
}
@@ -271,7 +271,7 @@ class ClassPathScanningCandidateComponentProviderTests {
assertThat(containsBeanClass(candidates, StubFooDao.class)).isTrue();
assertThat(containsBeanClass(candidates, ServiceInvocationCounter.class)).isTrue();
assertThat(containsBeanClass(candidates, BarComponent.class)).isTrue();
assertThat(candidates.size()).isEqualTo(4);
assertThat(candidates).hasSize(4);
assertBeanDefinitionType(candidates);
}
@@ -279,7 +279,7 @@ class ClassPathScanningCandidateComponentProviderTests {
void withNoFilters() {
ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(false);
Set<BeanDefinition> candidates = provider.findCandidateComponents(TEST_BASE_PACKAGE);
assertThat(candidates.size()).isEqualTo(0);
assertThat(candidates).hasSize(0);
}
@Test
@@ -290,7 +290,7 @@ class ClassPathScanningCandidateComponentProviderTests {
provider.addExcludeFilter(new AnnotationTypeFilter(Service.class));
provider.addExcludeFilter(new AnnotationTypeFilter(Controller.class));
Set<BeanDefinition> candidates = provider.findCandidateComponents(TEST_BASE_PACKAGE);
assertThat(candidates.size()).isEqualTo(3);
assertThat(candidates).hasSize(3);
assertThat(containsBeanClass(candidates, NamedComponent.class)).isTrue();
assertThat(containsBeanClass(candidates, ServiceInvocationCounter.class)).isTrue();
assertThat(containsBeanClass(candidates, BarComponent.class)).isTrue();
@@ -304,7 +304,7 @@ class ClassPathScanningCandidateComponentProviderTests {
ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(false);
provider.addIncludeFilter(new AnnotationTypeFilter(Aspect.class));
Set<BeanDefinition> candidates = provider.findCandidateComponents(TEST_BASE_PACKAGE);
assertThat(candidates.size()).isEqualTo(1);
assertThat(candidates).hasSize(1);
assertThat(containsBeanClass(candidates, ServiceInvocationCounter.class)).isTrue();
}
@@ -313,7 +313,7 @@ class ClassPathScanningCandidateComponentProviderTests {
ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(false);
provider.addIncludeFilter(new AssignableTypeFilter(FooDao.class));
Set<BeanDefinition> candidates = provider.findCandidateComponents(TEST_BASE_PACKAGE);
assertThat(candidates.size()).isEqualTo(1);
assertThat(candidates).hasSize(1);
assertThat(containsBeanClass(candidates, StubFooDao.class)).isTrue();
}
@@ -322,7 +322,7 @@ class ClassPathScanningCandidateComponentProviderTests {
ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(false);
provider.addIncludeFilter(new AssignableTypeFilter(MessageBean.class));
Set<BeanDefinition> candidates = provider.findCandidateComponents(TEST_BASE_PACKAGE);
assertThat(candidates.size()).isEqualTo(1);
assertThat(candidates).hasSize(1);
assertThat(containsBeanClass(candidates, MessageBean.class)).isTrue();
}
@@ -332,7 +332,7 @@ class ClassPathScanningCandidateComponentProviderTests {
provider.addIncludeFilter(new AnnotationTypeFilter(Component.class));
provider.addIncludeFilter(new AssignableTypeFilter(FooServiceImpl.class));
Set<BeanDefinition> candidates = provider.findCandidateComponents(TEST_BASE_PACKAGE);
assertThat(candidates.size()).isEqualTo(7);
assertThat(candidates).hasSize(7);
assertThat(containsBeanClass(candidates, NamedComponent.class)).isTrue();
assertThat(containsBeanClass(candidates, ServiceInvocationCounter.class)).isTrue();
assertThat(containsBeanClass(candidates, FooServiceImpl.class)).isTrue();
@@ -346,7 +346,7 @@ class ClassPathScanningCandidateComponentProviderTests {
provider.addIncludeFilter(new AssignableTypeFilter(FooServiceImpl.class));
provider.addExcludeFilter(new AssignableTypeFilter(FooService.class));
Set<BeanDefinition> candidates = provider.findCandidateComponents(TEST_BASE_PACKAGE);
assertThat(candidates.size()).isEqualTo(6);
assertThat(candidates).hasSize(6);
assertThat(containsBeanClass(candidates, NamedComponent.class)).isTrue();
assertThat(containsBeanClass(candidates, ServiceInvocationCounter.class)).isTrue();
assertThat(containsBeanClass(candidates, BarComponent.class)).isTrue();

8
spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
View File

@@ -1049,7 +1049,7 @@ class ConfigurationClassPostProcessorTests {
ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext(CollectionArgumentConfiguration.class, TestBean.class);
CollectionArgumentConfiguration bean = ctx.getBean(CollectionArgumentConfiguration.class);
assertThat(bean.testBeans).isNotNull();
assertThat(bean.testBeans.size()).isEqualTo(1);
assertThat(bean.testBeans).hasSize(1);
assertThat(bean.testBeans.get(0)).isSameAs(ctx.getBean(TestBean.class));
ctx.close();
}
@@ -1068,7 +1068,7 @@ class ConfigurationClassPostProcessorTests {
ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext(MapArgumentConfiguration.class, DummyRunnable.class);
MapArgumentConfiguration bean = ctx.getBean(MapArgumentConfiguration.class);
assertThat(bean.testBeans).isNotNull();
assertThat(bean.testBeans.size()).isEqualTo(1);
assertThat(bean.testBeans).hasSize(1);
assertThat(bean.testBeans.values().iterator().next()).isSameAs(ctx.getBean(Runnable.class));
ctx.close();
}
@@ -1087,7 +1087,7 @@ class ConfigurationClassPostProcessorTests {
ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext(CollectionInjectionConfiguration.class);
CollectionInjectionConfiguration bean = ctx.getBean(CollectionInjectionConfiguration.class);
assertThat(bean.testBeans).isNotNull();
assertThat(bean.testBeans.size()).isEqualTo(1);
assertThat(bean.testBeans).hasSize(1);
assertThat(bean.testBeans.get(0)).isSameAs(ctx.getBean(TestBean.class));
ctx.close();
}
@@ -1097,7 +1097,7 @@ class ConfigurationClassPostProcessorTests {
ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext(MapInjectionConfiguration.class);
MapInjectionConfiguration bean = ctx.getBean(MapInjectionConfiguration.class);
assertThat(bean.testBeans).isNotNull();
assertThat(bean.testBeans.size()).isEqualTo(1);
assertThat(bean.testBeans).hasSize(1);
assertThat(bean.testBeans.get("testBean")).isSameAs(ctx.getBean(Runnable.class));
ctx.close();
}

6
spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassWithConditionTests.java
View File

@@ -138,14 +138,14 @@ public class ConfigurationClassWithConditionTests {
@Test
public void conditionOnOverriddenMethodHonored() {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ConfigWithBeanSkipped.class);
assertThat(context.getBeansOfType(ExampleBean.class).size()).isEqualTo(0);
assertThat(context.getBeansOfType(ExampleBean.class)).hasSize(0);
}
@Test
public void noConditionOnOverriddenMethodHonored() {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ConfigWithBeanReactivated.class);
Map<String, ExampleBean> beans = context.getBeansOfType(ExampleBean.class);
assertThat(beans.size()).isEqualTo(1);
assertThat(beans).hasSize(1);
assertThat(beans.keySet().iterator().next()).isEqualTo("baz");
}
@@ -153,7 +153,7 @@ public class ConfigurationClassWithConditionTests {
public void configWithAlternativeBeans() {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ConfigWithAlternativeBeans.class);
Map<String, ExampleBean> beans = context.getBeansOfType(ExampleBean.class);
assertThat(beans.size()).isEqualTo(1);
assertThat(beans).hasSize(1);
assertThat(beans.keySet().iterator().next()).isEqualTo("baz");
}

10
spring-context/src/test/java/org/springframework/context/annotation/ImportSelectorTests.java
View File

@@ -126,8 +126,8 @@ public class ImportSelectorTests {
ordered.verify(beanFactory).registerBeanDefinition(eq("c"), any());
ordered.verify(beanFactory).registerBeanDefinition(eq("d"), any());
assertThat(TestImportGroup.instancesCount.get()).isEqualTo(1);
assertThat(TestImportGroup.imports.size()).isEqualTo(1);
assertThat(TestImportGroup.imports.values().iterator().next().size()).isEqualTo(2);
assertThat(TestImportGroup.imports).hasSize(1);
assertThat(TestImportGroup.imports.values().iterator().next()).hasSize(2);
}
@Test
@@ -141,7 +141,7 @@ public class ImportSelectorTests {
ordered.verify(beanFactory).registerBeanDefinition(eq("c"), any());
ordered.verify(beanFactory).registerBeanDefinition(eq("d"), any());
assertThat(TestImportGroup.instancesCount.get()).isEqualTo(1);
assertThat(TestImportGroup.imports.size()).isEqualTo(2);
assertThat(TestImportGroup.imports).hasSize(2);
Iterator<AnnotationMetadata> iterator = TestImportGroup.imports.keySet().iterator();
assertThat(iterator.next().getClassName()).isEqualTo(GroupedConfig2.class.getName());
assertThat(iterator.next().getClassName()).isEqualTo(GroupedConfig1.class.getName());
@@ -158,7 +158,7 @@ public class ImportSelectorTests {
ordered.verify(beanFactory).registerBeanDefinition(eq("e"), any());
ordered.verify(beanFactory).registerBeanDefinition(eq("c"), any());
assertThat(TestImportGroup.instancesCount.get()).isEqualTo(2);
assertThat(TestImportGroup.imports.size()).isEqualTo(2);
assertThat(TestImportGroup.imports).hasSize(2);
assertThat(TestImportGroup.allImports())
.containsOnlyKeys(ParentConfiguration1.class.getName(), ChildConfiguration1.class.getName());
assertThat(TestImportGroup.allImports().get(ParentConfiguration1.class.getName()))
@@ -177,7 +177,7 @@ public class ImportSelectorTests {
ordered.verify(beanFactory).registerBeanDefinition(eq("b"), any());
ordered.verify(beanFactory).registerBeanDefinition(eq("d"), any());
assertThat(TestImportGroup.instancesCount.get()).isEqualTo(2);
assertThat(TestImportGroup.allImports().size()).isEqualTo(2);
assertThat(TestImportGroup.allImports()).hasSize(2);
assertThat(TestImportGroup.allImports())
.containsOnlyKeys(ParentConfiguration2.class.getName(), ChildConfiguration2.class.getName());
assertThat(TestImportGroup.allImports().get(ParentConfiguration2.class.getName()))

2
spring-context/src/test/java/org/springframework/context/conversionservice/ConversionServiceContextConfigTests.java
View File

@@ -31,7 +31,7 @@ class ConversionServiceContextConfigTests {
void testConfigOk() {
try (ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("org/springframework/context/conversionservice/conversionService.xml")) {
TestClient client = context.getBean("testClient", TestClient.class);
assertThat(client.getBars().size()).isEqualTo(2);
assertThat(client.getBars()).hasSize(2);
assertThat(client.getBars().get(0).getValue()).isEqualTo("value1");
assertThat(client.getBars().get(1).getValue()).isEqualTo("value2");
assertThat(client.isBool()).isTrue();

14
spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
View File

@@ -191,7 +191,7 @@ public class ApplicationContextEventTests extends AbstractApplicationEventListen
smc.multicastEvent(new MyEvent(this));
smc.multicastEvent(new MyOtherEvent(this));
assertThat(listener1.seenEvents.size()).isEqualTo(2);
assertThat(listener1.seenEvents).hasSize(2);
}
@Test
@@ -205,7 +205,7 @@ public class ApplicationContextEventTests extends AbstractApplicationEventListen
smc.multicastEvent(new MyEvent(this));
smc.multicastEvent(new MyOtherEvent(this));
assertThat(listener1.seenEvents.size()).isEqualTo(2);
assertThat(listener1.seenEvents).hasSize(2);
}
@Test
@@ -222,7 +222,7 @@ public class ApplicationContextEventTests extends AbstractApplicationEventListen
smc.multicastEvent(new MyEvent(this));
smc.multicastEvent(new MyOtherEvent(this));
assertThat(listener1.seenEvents.size()).isEqualTo(2);
assertThat(listener1.seenEvents).hasSize(2);
}
@Test
@@ -241,7 +241,7 @@ public class ApplicationContextEventTests extends AbstractApplicationEventListen
smc.multicastEvent(new MyEvent(this));
smc.multicastEvent(new MyOtherEvent(this));
assertThat(listener1.seenEvents.size()).isEqualTo(2);
assertThat(listener1.seenEvents).hasSize(2);
}
@Test
@@ -298,7 +298,7 @@ public class ApplicationContextEventTests extends AbstractApplicationEventListen
assertThat(listener1.seenEvents.contains(event4)).isTrue();
AbstractApplicationEventMulticaster multicaster = context.getBean(AbstractApplicationEventMulticaster.class);
assertThat(multicaster.retrieverCache.size()).isEqualTo(2);
assertThat(multicaster.retrieverCache).hasSize(2);
context.close();
}
@@ -320,7 +320,7 @@ public class ApplicationContextEventTests extends AbstractApplicationEventListen
assertThat(listener.seenPayloads.contains("event4")).isTrue();
AbstractApplicationEventMulticaster multicaster = context.getBean(AbstractApplicationEventMulticaster.class);
assertThat(multicaster.retrieverCache.size()).isEqualTo(2);
assertThat(multicaster.retrieverCache).hasSize(2);
context.close();
}
@@ -384,7 +384,7 @@ public class ApplicationContextEventTests extends AbstractApplicationEventListen
MyNonSingletonListener.seenEvents.clear();
AbstractApplicationEventMulticaster multicaster = context.getBean(AbstractApplicationEventMulticaster.class);
assertThat(multicaster.retrieverCache.size()).isEqualTo(3);
assertThat(multicaster.retrieverCache).hasSize(3);
context.close();
}

10
spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java
View File

@@ -195,7 +195,7 @@ public class ClassPathXmlApplicationContextTests {
void factoryBeanAndApplicationListener() {
ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(CONTEXT_WILDCARD);
ctx.getBeanFactory().registerSingleton("manualFBAAL", new FactoryBeanAndApplicationListener());
assertThat(ctx.getBeansOfType(ApplicationListener.class).size()).isEqualTo(2);
assertThat(ctx.getBeansOfType(ApplicationListener.class)).hasSize(2);
ctx.close();
}
@@ -312,16 +312,16 @@ public class ClassPathXmlApplicationContextTests {
assertThat(beanNamesForType[0]).isEqualTo("myMessageSource");
Map<?, StaticMessageSource> beansOfType = ctx.getBeansOfType(StaticMessageSource.class);
assertThat(beansOfType.size()).isEqualTo(1);
assertThat(beansOfType).hasSize(1);
assertThat(beansOfType.values().iterator().next()).isSameAs(myMessageSource);
beansOfType = ctx.getBeansOfType(StaticMessageSource.class, true, true);
assertThat(beansOfType.size()).isEqualTo(1);
assertThat(beansOfType).hasSize(1);
assertThat(beansOfType.values().iterator().next()).isSameAs(myMessageSource);
beansOfType = BeanFactoryUtils.beansOfTypeIncludingAncestors(ctx, StaticMessageSource.class);
assertThat(beansOfType.size()).isEqualTo(1);
assertThat(beansOfType).hasSize(1);
assertThat(beansOfType.values().iterator().next()).isSameAs(myMessageSource);
beansOfType = BeanFactoryUtils.beansOfTypeIncludingAncestors(ctx, StaticMessageSource.class, true, true);
assertThat(beansOfType.size()).isEqualTo(1);
assertThat(beansOfType).hasSize(1);
assertThat(beansOfType.values().iterator().next()).isSameAs(myMessageSource);
}

36
spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java
View File

@@ -74,7 +74,7 @@ class DefaultLifecycleProcessorTests {
assertThat(bean.isRunning()).isTrue();
context.stop();
assertThat(bean.isRunning()).isFalse();
assertThat(startedBeans.size()).isEqualTo(1);
assertThat(startedBeans).hasSize(1);
context.close();
}
@@ -116,10 +116,10 @@ class DefaultLifecycleProcessorTests {
assertThat(bean.isRunning()).isFalse();
context.refresh();
assertThat(bean.isRunning()).isFalse();
assertThat(startedBeans.size()).isEqualTo(0);
assertThat(startedBeans).hasSize(0);
context.start();
assertThat(bean.isRunning()).isTrue();
assertThat(startedBeans.size()).isEqualTo(1);
assertThat(startedBeans).hasSize(1);
context.stop();
context.close();
}
@@ -143,7 +143,7 @@ class DefaultLifecycleProcessorTests {
context.stop();
assertThat(bean.isRunning()).isFalse();
assertThat(dependency.isRunning()).isFalse();
assertThat(startedBeans.size()).isEqualTo(1);
assertThat(startedBeans).hasSize(1);
context.close();
}
@@ -173,7 +173,7 @@ class DefaultLifecycleProcessorTests {
assertThat(bean3.isRunning()).isTrue();
assertThat(beanMax.isRunning()).isTrue();
context.stop();
assertThat(startedBeans.size()).isEqualTo(5);
assertThat(startedBeans).hasSize(5);
assertThat(getPhase(startedBeans.get(0))).isEqualTo(Integer.MIN_VALUE);
assertThat(getPhase(startedBeans.get(1))).isEqualTo(1);
assertThat(getPhase(startedBeans.get(2))).isEqualTo(2);
@@ -203,7 +203,7 @@ class DefaultLifecycleProcessorTests {
assertThat(smartBean2.isRunning()).isTrue();
assertThat(simpleBean1.isRunning()).isFalse();
assertThat(simpleBean2.isRunning()).isFalse();
assertThat(startedBeans.size()).isEqualTo(2);
assertThat(startedBeans).hasSize(2);
assertThat(getPhase(startedBeans.get(0))).isEqualTo(-3);
assertThat(getPhase(startedBeans.get(1))).isEqualTo(5);
context.start();
@@ -211,7 +211,7 @@ class DefaultLifecycleProcessorTests {
assertThat(smartBean2.isRunning()).isTrue();
assertThat(simpleBean1.isRunning()).isTrue();
assertThat(simpleBean2.isRunning()).isTrue();
assertThat(startedBeans.size()).isEqualTo(4);
assertThat(startedBeans).hasSize(4);
assertThat(getPhase(startedBeans.get(2))).isEqualTo(0);
assertThat(getPhase(startedBeans.get(3))).isEqualTo(0);
context.close();
@@ -238,7 +238,7 @@ class DefaultLifecycleProcessorTests {
assertThat(smartBean2.isRunning()).isTrue();
assertThat(simpleBean1.isRunning()).isFalse();
assertThat(simpleBean2.isRunning()).isFalse();
assertThat(startedBeans.size()).isEqualTo(2);
assertThat(startedBeans).hasSize(2);
assertThat(getPhase(startedBeans.get(0))).isEqualTo(-3);
assertThat(getPhase(startedBeans.get(1))).isEqualTo(5);
context.stop();
@@ -251,7 +251,7 @@ class DefaultLifecycleProcessorTests {
assertThat(smartBean2.isRunning()).isTrue();
assertThat(simpleBean1.isRunning()).isTrue();
assertThat(simpleBean2.isRunning()).isTrue();
assertThat(startedBeans.size()).isEqualTo(6);
assertThat(startedBeans).hasSize(6);
assertThat(getPhase(startedBeans.get(2))).isEqualTo(-3);
assertThat(getPhase(startedBeans.get(3))).isEqualTo(0);
assertThat(getPhase(startedBeans.get(4))).isEqualTo(0);
@@ -300,7 +300,7 @@ class DefaultLifecycleProcessorTests {
context.refresh();
assertThat(bean.isRunning()).isTrue();
context.stop();
assertThat(stoppedBeans.size()).isEqualTo(1);
assertThat(stoppedBeans).hasSize(1);
assertThat(bean.isRunning()).isFalse();
assertThat(stoppedBeans.get(0)).isEqualTo(bean);
context.close();
@@ -317,7 +317,7 @@ class DefaultLifecycleProcessorTests {
bean.start();
assertThat(bean.isRunning()).isTrue();
context.stop();
assertThat(stoppedBeans.size()).isEqualTo(1);
assertThat(stoppedBeans).hasSize(1);
assertThat(bean.isRunning()).isFalse();
assertThat(stoppedBeans.get(0)).isEqualTo(bean);
context.close();
@@ -361,7 +361,7 @@ class DefaultLifecycleProcessorTests {
assertThat(bean5.isRunning()).isFalse();
assertThat(bean6.isRunning()).isFalse();
assertThat(bean7.isRunning()).isFalse();
assertThat(stoppedBeans.size()).isEqualTo(7);
assertThat(stoppedBeans).hasSize(7);
assertThat(getPhase(stoppedBeans.get(0))).isEqualTo(Integer.MAX_VALUE);
assertThat(getPhase(stoppedBeans.get(1))).isEqualTo(500);
assertThat(getPhase(stoppedBeans.get(2))).isEqualTo(1);
@@ -390,7 +390,7 @@ class DefaultLifecycleProcessorTests {
assertThat(bean2.isRunning()).isTrue();
assertThat(bean99.isRunning()).isTrue();
assertThat(beanMax.isRunning()).isTrue();
assertThat(startedBeans.size()).isEqualTo(4);
assertThat(startedBeans).hasSize(4);
assertThat(getPhase(startedBeans.get(0))).isEqualTo(Integer.MIN_VALUE);
assertThat(getPhase(startedBeans.get(1))).isEqualTo(99);
assertThat(startedBeans.get(1)).isEqualTo(bean99);
@@ -433,7 +433,7 @@ class DefaultLifecycleProcessorTests {
assertThat(bean7.isRunning()).isFalse();
assertThat(bean99.isRunning()).isFalse();
assertThat(beanMax.isRunning()).isFalse();
assertThat(stoppedBeans.size()).isEqualTo(6);
assertThat(stoppedBeans).hasSize(6);
assertThat(getPhase(stoppedBeans.get(0))).isEqualTo(Integer.MAX_VALUE);
assertThat(getPhase(stoppedBeans.get(1))).isEqualTo(2);
assertThat(stoppedBeans.get(1)).isEqualTo(bean2);
@@ -467,7 +467,7 @@ class DefaultLifecycleProcessorTests {
assertThat(bean99.isRunning()).isTrue();
assertThat(bean7.isRunning()).isTrue();
assertThat(simpleBean.isRunning()).isTrue();
assertThat(startedBeans.size()).isEqualTo(4);
assertThat(startedBeans).hasSize(4);
assertThat(getPhase(startedBeans.get(0))).isEqualTo(-99);
assertThat(getPhase(startedBeans.get(1))).isEqualTo(7);
assertThat(getPhase(startedBeans.get(2))).isEqualTo(0);
@@ -509,7 +509,7 @@ class DefaultLifecycleProcessorTests {
assertThat(bean2.isRunning()).isFalse();
assertThat(bean7.isRunning()).isFalse();
assertThat(simpleBean.isRunning()).isFalse();
assertThat(stoppedBeans.size()).isEqualTo(6);
assertThat(stoppedBeans).hasSize(6);
assertThat(getPhase(stoppedBeans.get(0))).isEqualTo(7);
assertThat(getPhase(stoppedBeans.get(1))).isEqualTo(2);
assertThat(getPhase(stoppedBeans.get(2))).isEqualTo(1);
@@ -534,7 +534,7 @@ class DefaultLifecycleProcessorTests {
assertThat(beanMin.isRunning()).isTrue();
assertThat(bean7.isRunning()).isTrue();
assertThat(simpleBean.isRunning()).isTrue();
assertThat(startedBeans.size()).isEqualTo(3);
assertThat(startedBeans).hasSize(3);
assertThat(getPhase(startedBeans.get(0))).isEqualTo(0);
assertThat(getPhase(startedBeans.get(1))).isEqualTo(Integer.MIN_VALUE);
assertThat(getPhase(startedBeans.get(2))).isEqualTo(7);
@@ -572,7 +572,7 @@ class DefaultLifecycleProcessorTests {
assertThat(bean2.isRunning()).isFalse();
assertThat(bean7.isRunning()).isFalse();
assertThat(simpleBean.isRunning()).isFalse();
assertThat(stoppedBeans.size()).isEqualTo(5);
assertThat(stoppedBeans).hasSize(5);
assertThat(getPhase(stoppedBeans.get(0))).isEqualTo(7);
assertThat(getPhase(stoppedBeans.get(1))).isEqualTo(0);
assertThat(getPhase(stoppedBeans.get(2))).isEqualTo(2);

12
spring-context/src/test/java/org/springframework/context/support/ResourceBundleMessageSourceTests.java
View File

@@ -389,32 +389,32 @@ class ResourceBundleMessageSourceTests {
ReloadableResourceBundleMessageSource ms = new ReloadableResourceBundleMessageSource();
List<String> filenames = ms.calculateFilenamesForLocale("messages", Locale.ENGLISH);
assertThat(filenames.size()).isEqualTo(1);
assertThat(filenames).hasSize(1);
assertThat(filenames.get(0)).isEqualTo("messages_en");
filenames = ms.calculateFilenamesForLocale("messages", Locale.UK);
assertThat(filenames.size()).isEqualTo(2);
assertThat(filenames).hasSize(2);
assertThat(filenames.get(1)).isEqualTo("messages_en");
assertThat(filenames.get(0)).isEqualTo("messages_en_GB");
filenames = ms.calculateFilenamesForLocale("messages", new Locale("en", "GB", "POSIX"));
assertThat(filenames.size()).isEqualTo(3);
assertThat(filenames).hasSize(3);
assertThat(filenames.get(2)).isEqualTo("messages_en");
assertThat(filenames.get(1)).isEqualTo("messages_en_GB");
assertThat(filenames.get(0)).isEqualTo("messages_en_GB_POSIX");
filenames = ms.calculateFilenamesForLocale("messages", new Locale("en", "", "POSIX"));
assertThat(filenames.size()).isEqualTo(2);
assertThat(filenames).hasSize(2);
assertThat(filenames.get(1)).isEqualTo("messages_en");
assertThat(filenames.get(0)).isEqualTo("messages_en__POSIX");
filenames = ms.calculateFilenamesForLocale("messages", new Locale("", "UK", "POSIX"));
assertThat(filenames.size()).isEqualTo(2);
assertThat(filenames).hasSize(2);
assertThat(filenames.get(1)).isEqualTo("messages__UK");
assertThat(filenames.get(0)).isEqualTo("messages__UK_POSIX");
filenames = ms.calculateFilenamesForLocale("messages", new Locale("", "", "POSIX"));
assertThat(filenames.size()).isEqualTo(0);
assertThat(filenames).hasSize(0);
}
@Test

8
spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java
View File

@@ -63,7 +63,7 @@ public class EnableSchedulingTests {
@EnabledForTestGroups(LONG_RUNNING)
public void withFixedRateTask() throws InterruptedException {
ctx = new AnnotationConfigApplicationContext(FixedRateTaskConfig.class);
assertThat(ctx.getBean(ScheduledTaskHolder.class).getScheduledTasks().size()).isEqualTo(2);
assertThat(ctx.getBean(ScheduledTaskHolder.class).getScheduledTasks()).hasSize(2);
Thread.sleep(100);
assertThat(ctx.getBean(AtomicInteger.class).get()).isGreaterThanOrEqualTo(10);
@@ -73,7 +73,7 @@ public class EnableSchedulingTests {
@EnabledForTestGroups(LONG_RUNNING)
public void withSubclass() throws InterruptedException {
ctx = new AnnotationConfigApplicationContext(FixedRateTaskConfigSubclass.class);
assertThat(ctx.getBean(ScheduledTaskHolder.class).getScheduledTasks().size()).isEqualTo(2);
assertThat(ctx.getBean(ScheduledTaskHolder.class).getScheduledTasks()).hasSize(2);
Thread.sleep(100);
assertThat(ctx.getBean(AtomicInteger.class).get()).isGreaterThanOrEqualTo(10);
@@ -83,7 +83,7 @@ public class EnableSchedulingTests {
@EnabledForTestGroups(LONG_RUNNING)
public void withExplicitScheduler() throws InterruptedException {
ctx = new AnnotationConfigApplicationContext(ExplicitSchedulerConfig.class);
assertThat(ctx.getBean(ScheduledTaskHolder.class).getScheduledTasks().size()).isEqualTo(1);
assertThat(ctx.getBean(ScheduledTaskHolder.class).getScheduledTasks()).hasSize(1);
Thread.sleep(100);
assertThat(ctx.getBean(AtomicInteger.class).get()).isGreaterThanOrEqualTo(10);
@@ -102,7 +102,7 @@ public class EnableSchedulingTests {
@EnabledForTestGroups(LONG_RUNNING)
public void withExplicitScheduledTaskRegistrar() throws InterruptedException {
ctx = new AnnotationConfigApplicationContext(ExplicitScheduledTaskRegistrarConfig.class);
assertThat(ctx.getBean(ScheduledTaskHolder.class).getScheduledTasks().size()).isEqualTo(1);
assertThat(ctx.getBean(ScheduledTaskHolder.class).getScheduledTasks()).hasSize(1);
Thread.sleep(100);
assertThat(ctx.getBean(AtomicInteger.class).get()).isGreaterThanOrEqualTo(10);

62
spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java
View File

@@ -104,7 +104,7 @@ class ScheduledAnnotationBeanPostProcessorTests {
context.refresh();
ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
assertThat(postProcessor.getScheduledTasks()).hasSize(1);
Object target = context.getBean("target");
ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
@@ -137,7 +137,7 @@ class ScheduledAnnotationBeanPostProcessorTests {
context.refresh();
ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
assertThat(postProcessor.getScheduledTasks()).hasSize(1);
Object target = context.getBean("target");
ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
@@ -145,7 +145,7 @@ class ScheduledAnnotationBeanPostProcessorTests {
@SuppressWarnings("unchecked")
List<IntervalTask> fixedRateTasks = (List<IntervalTask>)
new DirectFieldAccessor(registrar).getPropertyValue("fixedRateTasks");
assertThat(fixedRateTasks.size()).isEqualTo(1);
assertThat(fixedRateTasks).hasSize(1);
IntervalTask task = fixedRateTasks.get(0);
ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
Object targetObject = runnable.getTarget();
@@ -172,7 +172,7 @@ class ScheduledAnnotationBeanPostProcessorTests {
context.refresh();
ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
assertThat(postProcessor.getScheduledTasks()).hasSize(1);
Object target = context.getBean("target");
ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
@@ -180,7 +180,7 @@ class ScheduledAnnotationBeanPostProcessorTests {
@SuppressWarnings("unchecked")
List<IntervalTask> fixedRateTasks = (List<IntervalTask>)
new DirectFieldAccessor(registrar).getPropertyValue("fixedRateTasks");
assertThat(fixedRateTasks.size()).isEqualTo(1);
assertThat(fixedRateTasks).hasSize(1);
IntervalTask task = fixedRateTasks.get(0);
ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
Object targetObject = runnable.getTarget();
@@ -237,7 +237,7 @@ class ScheduledAnnotationBeanPostProcessorTests {
context.refresh();
ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(2);
assertThat(postProcessor.getScheduledTasks()).hasSize(2);
Object target = context.getBean("target");
ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
@@ -245,7 +245,7 @@ class ScheduledAnnotationBeanPostProcessorTests {
@SuppressWarnings("unchecked")
List<IntervalTask> fixedRateTasks = (List<IntervalTask>)
new DirectFieldAccessor(registrar).getPropertyValue("fixedRateTasks");
assertThat(fixedRateTasks.size()).isEqualTo(2);
assertThat(fixedRateTasks).hasSize(2);
IntervalTask task1 = fixedRateTasks.get(0);
ScheduledMethodRunnable runnable1 = (ScheduledMethodRunnable) task1.getRunnable();
Object targetObject = runnable1.getTarget();
@@ -273,7 +273,7 @@ class ScheduledAnnotationBeanPostProcessorTests {
context.refresh();
ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
assertThat(postProcessor.getScheduledTasks()).hasSize(1);
Object target = context.getBean("target");
ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
@@ -281,7 +281,7 @@ class ScheduledAnnotationBeanPostProcessorTests {
@SuppressWarnings("unchecked")
List<CronTask> cronTasks = (List<CronTask>)
new DirectFieldAccessor(registrar).getPropertyValue("cronTasks");
assertThat(cronTasks.size()).isEqualTo(1);
assertThat(cronTasks).hasSize(1);
CronTask task = cronTasks.get(0);
ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
Object targetObject = runnable.getTarget();
@@ -300,7 +300,7 @@ class ScheduledAnnotationBeanPostProcessorTests {
context.refresh();
ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
assertThat(postProcessor.getScheduledTasks()).hasSize(1);
Object target = context.getBean("target");
ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
@@ -308,7 +308,7 @@ class ScheduledAnnotationBeanPostProcessorTests {
@SuppressWarnings("unchecked")
List<CronTask> cronTasks = (List<CronTask>)
new DirectFieldAccessor(registrar).getPropertyValue("cronTasks");
assertThat(cronTasks.size()).isEqualTo(1);
assertThat(cronTasks).hasSize(1);
CronTask task = cronTasks.get(0);
ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
Object targetObject = runnable.getTarget();
@@ -367,14 +367,14 @@ class ScheduledAnnotationBeanPostProcessorTests {
context.refresh();
ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
assertThat(postProcessor.getScheduledTasks()).hasSize(1);
ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
new DirectFieldAccessor(postProcessor).getPropertyValue("registrar");
@SuppressWarnings("unchecked")
List<CronTask> cronTasks = (List<CronTask>)
new DirectFieldAccessor(registrar).getPropertyValue("cronTasks");
assertThat(cronTasks.size()).isEqualTo(1);
assertThat(cronTasks).hasSize(1);
CronTask task = cronTasks.get(0);
ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
Object targetObject = runnable.getTarget();
@@ -393,7 +393,7 @@ class ScheduledAnnotationBeanPostProcessorTests {
context.refresh();
ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
assertThat(postProcessor.getScheduledTasks()).hasSize(1);
Object target = context.getBean("target");
ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
@@ -401,7 +401,7 @@ class ScheduledAnnotationBeanPostProcessorTests {
@SuppressWarnings("unchecked")
List<IntervalTask> fixedRateTasks = (List<IntervalTask>)
new DirectFieldAccessor(registrar).getPropertyValue("fixedRateTasks");
assertThat(fixedRateTasks.size()).isEqualTo(1);
assertThat(fixedRateTasks).hasSize(1);
IntervalTask task = fixedRateTasks.get(0);
ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
Object targetObject = runnable.getTarget();
@@ -420,7 +420,7 @@ class ScheduledAnnotationBeanPostProcessorTests {
context.refresh();
ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
assertThat(postProcessor.getScheduledTasks()).hasSize(1);
Object target = context.getBean("target");
ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
@@ -428,7 +428,7 @@ class ScheduledAnnotationBeanPostProcessorTests {
@SuppressWarnings("unchecked")
List<IntervalTask> fixedRateTasks = (List<IntervalTask>)
new DirectFieldAccessor(registrar).getPropertyValue("fixedRateTasks");
assertThat(fixedRateTasks.size()).isEqualTo(1);
assertThat(fixedRateTasks).hasSize(1);
IntervalTask task = fixedRateTasks.get(0);
ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
Object targetObject = runnable.getTarget();
@@ -448,7 +448,7 @@ class ScheduledAnnotationBeanPostProcessorTests {
context.refresh();
ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
assertThat(postProcessor.getScheduledTasks()).hasSize(1);
Object target = context.getBean("target");
ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
@@ -456,7 +456,7 @@ class ScheduledAnnotationBeanPostProcessorTests {
@SuppressWarnings("unchecked")
List<CronTask> cronTasks = (List<CronTask>)
new DirectFieldAccessor(registrar).getPropertyValue("cronTasks");
assertThat(cronTasks.size()).isEqualTo(1);
assertThat(cronTasks).hasSize(1);
CronTask task = cronTasks.get(0);
ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
Object targetObject = runnable.getTarget();
@@ -481,7 +481,7 @@ class ScheduledAnnotationBeanPostProcessorTests {
context.refresh();
ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
assertThat(postProcessor.getScheduledTasks()).hasSize(1);
Object target = context.getBean("target");
ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
@@ -489,7 +489,7 @@ class ScheduledAnnotationBeanPostProcessorTests {
@SuppressWarnings("unchecked")
List<CronTask> cronTasks = (List<CronTask>)
new DirectFieldAccessor(registrar).getPropertyValue("cronTasks");
assertThat(cronTasks.size()).isEqualTo(1);
assertThat(cronTasks).hasSize(1);
CronTask task = cronTasks.get(0);
ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
Object targetObject = runnable.getTarget();
@@ -540,7 +540,7 @@ class ScheduledAnnotationBeanPostProcessorTests {
context.refresh();
ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
assertThat(postProcessor.getScheduledTasks()).hasSize(1);
Object target = context.getBean("target");
ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
@@ -548,7 +548,7 @@ class ScheduledAnnotationBeanPostProcessorTests {
@SuppressWarnings("unchecked")
List<IntervalTask> fixedDelayTasks = (List<IntervalTask>)
new DirectFieldAccessor(registrar).getPropertyValue("fixedDelayTasks");
assertThat(fixedDelayTasks.size()).isEqualTo(1);
assertThat(fixedDelayTasks).hasSize(1);
IntervalTask task = fixedDelayTasks.get(0);
ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
Object targetObject = runnable.getTarget();
@@ -584,7 +584,7 @@ class ScheduledAnnotationBeanPostProcessorTests {
context.refresh();
ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
assertThat(postProcessor.getScheduledTasks()).hasSize(1);
Object target = context.getBean("target");
ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
@@ -592,7 +592,7 @@ class ScheduledAnnotationBeanPostProcessorTests {
@SuppressWarnings("unchecked")
List<IntervalTask> fixedRateTasks = (List<IntervalTask>)
new DirectFieldAccessor(registrar).getPropertyValue("fixedRateTasks");
assertThat(fixedRateTasks.size()).isEqualTo(1);
assertThat(fixedRateTasks).hasSize(1);
IntervalTask task = fixedRateTasks.get(0);
ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
Object targetObject = runnable.getTarget();
@@ -618,7 +618,7 @@ class ScheduledAnnotationBeanPostProcessorTests {
context.refresh();
ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
assertThat(postProcessor.getScheduledTasks()).hasSize(1);
Object target = context.getBean("target");
ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
@@ -626,7 +626,7 @@ class ScheduledAnnotationBeanPostProcessorTests {
@SuppressWarnings("unchecked")
List<CronTask> cronTasks = (List<CronTask>)
new DirectFieldAccessor(registrar).getPropertyValue("cronTasks");
assertThat(cronTasks.size()).isEqualTo(1);
assertThat(cronTasks).hasSize(1);
CronTask task = cronTasks.get(0);
ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
Object targetObject = runnable.getTarget();
@@ -651,7 +651,7 @@ class ScheduledAnnotationBeanPostProcessorTests {
context.refresh();
ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
assertThat(postProcessor.getScheduledTasks()).hasSize(1);
Object target = context.getBean("target");
ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
@@ -659,7 +659,7 @@ class ScheduledAnnotationBeanPostProcessorTests {
@SuppressWarnings("unchecked")
List<CronTask> cronTasks = (List<CronTask>)
new DirectFieldAccessor(registrar).getPropertyValue("cronTasks");
assertThat(cronTasks.size()).isEqualTo(1);
assertThat(cronTasks).hasSize(1);
CronTask task = cronTasks.get(0);
ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
Object targetObject = runnable.getTarget();
@@ -678,7 +678,7 @@ class ScheduledAnnotationBeanPostProcessorTests {
context.refresh();
ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
assertThat(postProcessor.getScheduledTasks()).hasSize(1);
Object target = context.getBean("target");
ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
@@ -686,7 +686,7 @@ class ScheduledAnnotationBeanPostProcessorTests {
@SuppressWarnings("unchecked")
List<CronTask> cronTasks = (List<CronTask>)
new DirectFieldAccessor(registrar).getPropertyValue("cronTasks");
assertThat(cronTasks.size()).isEqualTo(1);
assertThat(cronTasks).hasSize(1);
CronTask task = cronTasks.get(0);
ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
Object targetObject = runnable.getTarget();

2
spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java
View File

@@ -463,7 +463,7 @@ public class GroovyScriptFactoryTests {
public void testAnonymousScriptDetected() throws Exception {
ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd.xml", getClass());
Map<?, Messenger> beans = ctx.getBeansOfType(Messenger.class);
assertThat(beans.size()).isEqualTo(4);
assertThat(beans).hasSize(4);
assertThat(ctx.getBean(MyBytecodeProcessor.class).processed.contains(
"org.springframework.scripting.groovy.GroovyMessenger2")).isTrue();
}

26
spring-context/src/test/java/org/springframework/ui/ModelMapTests.java
View File

@@ -44,7 +44,7 @@ public class ModelMapTests {
@Test
public void testNoArgCtorYieldsEmptyModel() throws Exception {
assertThat(new ModelMap().size()).isEqualTo(0);
assertThat(new ModelMap()).hasSize(0);
}
/*
@@ -71,7 +71,7 @@ public class ModelMapTests {
@Test
public void testNamedObjectCtor() throws Exception {
ModelMap model = new ModelMap("foo", "bing");
assertThat(model.size()).isEqualTo(1);
assertThat(model).hasSize(1);
String bing = (String) model.get("foo");
assertThat(bing).isNotNull();
assertThat(bing).isEqualTo("bing");
@@ -80,7 +80,7 @@ public class ModelMapTests {
@Test
public void testUnnamedCtorScalar() throws Exception {
ModelMap model = new ModelMap("foo", "bing");
assertThat(model.size()).isEqualTo(1);
assertThat(model).hasSize(1);
String bing = (String) model.get("foo");
assertThat(bing).isNotNull();
assertThat(bing).isEqualTo("bing");
@@ -89,7 +89,7 @@ public class ModelMapTests {
@Test
public void testOneArgCtorWithScalar() throws Exception {
ModelMap model = new ModelMap("bing");
assertThat(model.size()).isEqualTo(1);
assertThat(model).hasSize(1);
String string = (String) model.get("string");
assertThat(string).isNotNull();
assertThat(string).isEqualTo("bing");
@@ -105,7 +105,7 @@ public class ModelMapTests {
@Test
public void testOneArgCtorWithCollection() throws Exception {
ModelMap model = new ModelMap(new String[]{"foo", "boing"});
assertThat(model.size()).isEqualTo(1);
assertThat(model).hasSize(1);
String[] strings = (String[]) model.get("stringList");
assertThat(strings).isNotNull();
assertThat(strings.length).isEqualTo(2);
@@ -117,7 +117,7 @@ public class ModelMapTests {
public void testOneArgCtorWithEmptyCollection() throws Exception {
ModelMap model = new ModelMap(new HashSet<>());
// must not add if collection is empty...
assertThat(model.size()).isEqualTo(0);
assertThat(model).hasSize(0);
}
@Test
@@ -131,7 +131,7 @@ public class ModelMapTests {
@Test
public void testAddObjectWithEmptyArray() throws Exception {
ModelMap model = new ModelMap(new int[]{});
assertThat(model.size()).isEqualTo(1);
assertThat(model).hasSize(1);
int[] ints = (int[]) model.get("intList");
assertThat(ints).isNotNull();
assertThat(ints.length).isEqualTo(0);
@@ -141,14 +141,14 @@ public class ModelMapTests {
public void testAddAllObjectsWithNullMap() throws Exception {
ModelMap model = new ModelMap();
model.addAllAttributes((Map<String, ?>) null);
assertThat(model.size()).isEqualTo(0);
assertThat(model).hasSize(0);
}
@Test
public void testAddAllObjectsWithNullCollection() throws Exception {
ModelMap model = new ModelMap();
model.addAllAttributes((Collection<Object>) null);
assertThat(model.size()).isEqualTo(0);
assertThat(model).hasSize(0);
}
@Test
@@ -169,7 +169,7 @@ public class ModelMapTests {
map.put("two", "two-value");
ModelMap model = new ModelMap();
model.addAttribute(map);
assertThat(model.size()).isEqualTo(1);
assertThat(model).hasSize(1);
String key = StringUtils.uncapitalize(ClassUtils.getShortName(map.getClass()));
assertThat(model.containsKey(key)).isTrue();
}
@@ -179,7 +179,7 @@ public class ModelMapTests {
ModelMap model = new ModelMap();
model.addAttribute("foo");
model.addAttribute("bar");
assertThat(model.size()).isEqualTo(1);
assertThat(model).hasSize(1);
String bar = (String) model.get("string");
assertThat(bar).isEqualTo("bar");
}
@@ -192,7 +192,7 @@ public class ModelMapTests {
beans.add(new TestBean("three"));
ModelMap model = new ModelMap();
model.addAllAttributes(beans);
assertThat(model.size()).isEqualTo(1);
assertThat(model).hasSize(1);
}
@Test
@@ -204,7 +204,7 @@ public class ModelMapTests {
ModelMap model = new ModelMap();
model.put("one", new TestBean("oneOld"));
model.mergeAttributes(beans);
assertThat(model.size()).isEqualTo(3);
assertThat(model).hasSize(3);
assertThat(((TestBean) model.get("one")).getName()).isEqualTo("oneOld");
}

4
spring-context/src/test/java/org/springframework/validation/DataBinderTests.java
View File

@@ -1926,7 +1926,7 @@ class DataBinderTests {
List<Object> list = (List<Object>) form.getF().get("list");
assertThat(list.get(0)).isEqualTo("firstValue");
assertThat(list.get(1)).isEqualTo("secondValue");
assertThat(list.size()).isEqualTo(2);
assertThat(list).hasSize(2);
}
@Test
@@ -1959,7 +1959,7 @@ class DataBinderTests {
pvs.add("integerList[256]", "1");
binder.bind(pvs);
assertThat(tb.getIntegerList().size()).isEqualTo(257);
assertThat(tb.getIntegerList()).hasSize(257);
assertThat(tb.getIntegerList().get(256)).isEqualTo(Integer.valueOf(1));
assertThat(binder.getBindingResult().getFieldValue("integerList[256]")).isEqualTo(1);
}

14
spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java
View File

@@ -68,7 +68,7 @@ class ValidatorFactoryTests {
ValidPerson person = new ValidPerson();
Set<ConstraintViolation<ValidPerson>> result = validator.validate(person);
assertThat(result.size()).isEqualTo(2);
assertThat(result).hasSize(2);
for (ConstraintViolation<ValidPerson> cv : result) {
String path = cv.getPropertyPath().toString();
assertThat(path).matches(actual -> "name".equals(actual) || "address.street".equals(actual));
@@ -92,7 +92,7 @@ class ValidatorFactoryTests {
ValidPerson person = new ValidPerson();
Set<ConstraintViolation<ValidPerson>> result = validator.validate(person);
assertThat(result.size()).isEqualTo(2);
assertThat(result).hasSize(2);
for (ConstraintViolation<ValidPerson> cv : result) {
String path = cv.getPropertyPath().toString();
assertThat(path).matches(actual -> "name".equals(actual) || "address.street".equals(actual));
@@ -117,7 +117,7 @@ class ValidatorFactoryTests {
person.setName("Juergen");
person.getAddress().setStreet("Juergen's Street");
Set<ConstraintViolation<ValidPerson>> result = validator.validate(person);
assertThat(result.size()).isEqualTo(1);
assertThat(result).hasSize(1);
Iterator<ConstraintViolation<ValidPerson>> iterator = result.iterator();
ConstraintViolation<?> cv = iterator.next();
assertThat(cv.getPropertyPath().toString()).isEqualTo("");
@@ -158,7 +158,7 @@ class ValidatorFactoryTests {
FieldError fieldError = result.getFieldError("name");
assertThat(fieldError.getField()).isEqualTo("name");
List<String> errorCodes = Arrays.asList(fieldError.getCodes());
assertThat(errorCodes.size()).isEqualTo(4);
assertThat(errorCodes).hasSize(4);
assertThat(errorCodes.contains("NotNull.person.name")).isTrue();
assertThat(errorCodes.contains("NotNull.name")).isTrue();
assertThat(errorCodes.contains("NotNull.java.lang.String")).isTrue();
@@ -166,7 +166,7 @@ class ValidatorFactoryTests {
fieldError = result.getFieldError("address.street");
assertThat(fieldError.getField()).isEqualTo("address.street");
errorCodes = Arrays.asList(fieldError.getCodes());
assertThat(errorCodes.size()).isEqualTo(5);
assertThat(errorCodes).hasSize(5);
assertThat(errorCodes.contains("NotNull.person.address.street")).isTrue();
assertThat(errorCodes.contains("NotNull.address.street")).isTrue();
assertThat(errorCodes.contains("NotNull.street")).isTrue();
@@ -190,7 +190,7 @@ class ValidatorFactoryTests {
assertThat(result.getErrorCount()).isEqualTo(1);
ObjectError globalError = result.getGlobalError();
List<String> errorCodes = Arrays.asList(globalError.getCodes());
assertThat(errorCodes.size()).isEqualTo(2);
assertThat(errorCodes).hasSize(2);
assertThat(errorCodes.contains("NameAddressValid.person")).isTrue();
assertThat(errorCodes.contains("NameAddressValid")).isTrue();
@@ -212,7 +212,7 @@ class ValidatorFactoryTests {
assertThat(result.getErrorCount()).isEqualTo(1);
ObjectError globalError = result.getGlobalError();
List<String> errorCodes = Arrays.asList(globalError.getCodes());
assertThat(errorCodes.size()).isEqualTo(2);
assertThat(errorCodes).hasSize(2);
assertThat(errorCodes.contains("NameAddressValid.person")).isTrue();
assertThat(errorCodes.contains("NameAddressValid")).isTrue();