diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java index 847ef4f3804..136adaa499d 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java @@ -366,7 +366,7 @@ abstract class AbstractAspectJAdvisorFactoryTests { new SingletonMetadataAwareAspectInstanceFactory(new MakeLockable(), "someBean")), CannotBeUnlocked.class).isEmpty()).isTrue(); assertThat(AopUtils.findAdvisorsThatCanApply(getFixture().getAdvisors( - new SingletonMetadataAwareAspectInstanceFactory(new MakeLockable(),"someBean")), NotLockable.class).size()).isEqualTo(2); + new SingletonMetadataAwareAspectInstanceFactory(new MakeLockable(),"someBean")), NotLockable.class)).hasSize(2); } @Test diff --git a/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java b/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java index cae248880f5..43ccef4fd29 100644 --- a/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java @@ -1010,11 +1010,11 @@ abstract class AbstractPropertyAccessorTests { accessor.setPropertyValue("list", list); assertThat(target.getCollection()).hasSize(1); assertThat(target.getCollection().containsAll(coll)).isTrue(); - assertThat(target.getSet().size()).isEqualTo(1); + assertThat(target.getSet()).hasSize(1); assertThat(target.getSet().containsAll(set)).isTrue(); - assertThat(target.getSortedSet().size()).isEqualTo(1); + assertThat(target.getSortedSet()).hasSize(1); assertThat(target.getSortedSet().containsAll(sortedSet)).isTrue(); - assertThat(target.getList().size()).isEqualTo(1); + assertThat(target.getList()).hasSize(1); assertThat(target.getList().containsAll(list)).isTrue(); } @@ -1037,11 +1037,11 @@ abstract class AbstractPropertyAccessorTests { accessor.setPropertyValue("list", list.toArray()); assertThat(target.getCollection()).hasSize(1); assertThat(target.getCollection().containsAll(coll)).isTrue(); - assertThat(target.getSet().size()).isEqualTo(1); + assertThat(target.getSet()).hasSize(1); assertThat(target.getSet().containsAll(set)).isTrue(); - assertThat(target.getSortedSet().size()).isEqualTo(1); + assertThat(target.getSortedSet()).hasSize(1); assertThat(target.getSortedSet().containsAll(sortedSet)).isTrue(); - assertThat(target.getList().size()).isEqualTo(1); + assertThat(target.getList()).hasSize(1); assertThat(target.getList().containsAll(list)).isTrue(); } @@ -1064,11 +1064,11 @@ abstract class AbstractPropertyAccessorTests { accessor.setPropertyValue("list", new int[]{3}); assertThat(target.getCollection()).hasSize(1); assertThat(target.getCollection().containsAll(coll)).isTrue(); - assertThat(target.getSet().size()).isEqualTo(1); + assertThat(target.getSet()).hasSize(1); assertThat(target.getSet().containsAll(set)).isTrue(); - assertThat(target.getSortedSet().size()).isEqualTo(1); + assertThat(target.getSortedSet()).hasSize(1); assertThat(target.getSortedSet().containsAll(sortedSet)).isTrue(); - assertThat(target.getList().size()).isEqualTo(1); + assertThat(target.getList()).hasSize(1); assertThat(target.getList().containsAll(list)).isTrue(); } @@ -1091,11 +1091,11 @@ abstract class AbstractPropertyAccessorTests { accessor.setPropertyValue("list", 3); assertThat(target.getCollection()).hasSize(1); assertThat(target.getCollection().containsAll(coll)).isTrue(); - assertThat(target.getSet().size()).isEqualTo(1); + assertThat(target.getSet()).hasSize(1); assertThat(target.getSet().containsAll(set)).isTrue(); - assertThat(target.getSortedSet().size()).isEqualTo(1); + assertThat(target.getSortedSet()).hasSize(1); assertThat(target.getSortedSet().containsAll(sortedSet)).isTrue(); - assertThat(target.getList().size()).isEqualTo(1); + assertThat(target.getList()).hasSize(1); assertThat(target.getList().containsAll(list)).isTrue(); } @@ -1113,15 +1113,16 @@ abstract class AbstractPropertyAccessorTests { Set list = new HashSet<>(); list.add("list1"); accessor.setPropertyValue("list", "list1"); - assertThat(target.getSet().size()).isEqualTo(1); + assertThat(target.getSet()).hasSize(1); assertThat(target.getSet().containsAll(set)).isTrue(); - assertThat(target.getSortedSet().size()).isEqualTo(1); + assertThat(target.getSortedSet()).hasSize(1); assertThat(target.getSortedSet().containsAll(sortedSet)).isTrue(); - assertThat(target.getList().size()).isEqualTo(1); + assertThat(target.getList()).hasSize(1); assertThat(target.getList().containsAll(list)).isTrue(); } @Test + @SuppressWarnings("unchecked") void setCollectionPropertyWithStringValueAndCustomEditor() { IndexedTestBean target = new IndexedTestBean(); AbstractPropertyAccessor accessor = createAccessor(target); @@ -1131,11 +1132,11 @@ abstract class AbstractPropertyAccessorTests { accessor.setPropertyValue("set", "set1 "); accessor.setPropertyValue("sortedSet", "sortedSet1"); accessor.setPropertyValue("list", "list1 "); - assertThat(target.getSet().size()).isEqualTo(1); + assertThat(target.getSet()).hasSize(1); assertThat(target.getSet().contains("set1")).isTrue(); - assertThat(target.getSortedSet().size()).isEqualTo(1); + assertThat(target.getSortedSet()).hasSize(1); assertThat(target.getSortedSet().contains("sortedSet1")).isTrue(); - assertThat(target.getList().size()).isEqualTo(1); + assertThat(target.getList()).hasSize(1); assertThat(target.getList().contains("list1")).isTrue(); accessor.setPropertyValue("list", Collections.singletonList("list1 ")); @@ -1169,7 +1170,7 @@ abstract class AbstractPropertyAccessorTests { accessor.setPropertyValue("sortedMap", sortedMap); assertThat(target.getMap()).hasSize(1); assertThat(target.getMap().get("key")).isEqualTo("value"); - assertThat(target.getSortedMap().size()).isEqualTo(1); + assertThat(target.getSortedMap()).hasSize(1); assertThat(target.getSortedMap().get("sortedKey")).isEqualTo("sortedValue"); } diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java index 78524e632b0..913b901b176 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java @@ -125,7 +125,7 @@ public class BeanWrapperAutoGrowingTests { @Test public void getPropertyValueAutoGrowList() { assertNotNull(wrapper.getPropertyValue("list[0]")); - assertThat(bean.getList().size()).isEqualTo(1); + assertThat(bean.getList()).hasSize(1); assertThat(bean.getList().get(0)).isInstanceOf(Bean.class); } @@ -138,7 +138,7 @@ public class BeanWrapperAutoGrowingTests { @Test public void getPropertyValueAutoGrowListBySeveralElements() { assertNotNull(wrapper.getPropertyValue("list[4]")); - assertThat(bean.getList().size()).isEqualTo(5); + assertThat(bean.getList()).hasSize(5); assertThat(bean.getList().get(0)).isInstanceOf(Bean.class); assertThat(bean.getList().get(1)).isInstanceOf(Bean.class); assertThat(bean.getList().get(2)).isInstanceOf(Bean.class); @@ -161,7 +161,7 @@ public class BeanWrapperAutoGrowingTests { @Test public void getPropertyValueAutoGrowMultiDimensionalList() { assertNotNull(wrapper.getPropertyValue("multiList[0][0]")); - assertThat(bean.getMultiList().get(0).size()).isEqualTo(1); + assertThat(bean.getMultiList().get(0)).hasSize(1); assertThat(bean.getMultiList().get(0).get(0)).isInstanceOf(Bean.class); } diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperEnumTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperEnumTests.java index 95bd30cfb84..605e81b55f3 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperEnumTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperEnumTests.java @@ -91,7 +91,7 @@ public class BeanWrapperEnumTests { GenericBean gb = new GenericBean<>(); BeanWrapper bw = new BeanWrapperImpl(gb); bw.setPropertyValue("customEnumSet", "VALUE_1"); - assertThat(gb.getCustomEnumSet().size()).isEqualTo(1); + assertThat(gb.getCustomEnumSet()).hasSize(1); assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_1)).isTrue(); } @@ -100,7 +100,7 @@ public class BeanWrapperEnumTests { GenericBean gb = new GenericBean<>(); BeanWrapper bw = new BeanWrapperImpl(gb); bw.setPropertyValue("customEnumSet", new String[] {"VALUE_1", "VALUE_2"}); - assertThat(gb.getCustomEnumSet().size()).isEqualTo(2); + assertThat(gb.getCustomEnumSet()).hasSize(2); assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_1)).isTrue(); assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_2)).isTrue(); } @@ -110,7 +110,7 @@ public class BeanWrapperEnumTests { GenericBean gb = new GenericBean<>(); BeanWrapper bw = new BeanWrapperImpl(gb); bw.setPropertyValue("customEnumSet", "VALUE_1,VALUE_2"); - assertThat(gb.getCustomEnumSet().size()).isEqualTo(2); + assertThat(gb.getCustomEnumSet()).hasSize(2); assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_1)).isTrue(); assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_2)).isTrue(); } @@ -120,7 +120,7 @@ public class BeanWrapperEnumTests { GenericBean gb = new GenericBean<>(); BeanWrapper bw = new BeanWrapperImpl(gb); bw.setPropertyValue("customEnumSetMismatch", new String[] {"VALUE_1", "VALUE_2"}); - assertThat(gb.getCustomEnumSet().size()).isEqualTo(2); + assertThat(gb.getCustomEnumSet()).hasSize(2); assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_1)).isTrue(); assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_2)).isTrue(); } @@ -132,7 +132,7 @@ public class BeanWrapperEnumTests { bw.setConversionService(new DefaultConversionService()); assertThat(gb.getStandardEnumSet()).isNull(); bw.setPropertyValue("standardEnumSet", new String[] {"VALUE_1", "VALUE_2"}); - assertThat(gb.getStandardEnumSet().size()).isEqualTo(2); + assertThat(gb.getStandardEnumSet()).hasSize(2); assertThat(gb.getStandardEnumSet().contains(CustomEnum.VALUE_1)).isTrue(); assertThat(gb.getStandardEnumSet().contains(CustomEnum.VALUE_2)).isTrue(); } @@ -144,7 +144,7 @@ public class BeanWrapperEnumTests { bw.setAutoGrowNestedPaths(true); assertThat(gb.getStandardEnumSet()).isNull(); bw.getPropertyValue("standardEnumSet.class"); - assertThat(gb.getStandardEnumSet().size()).isEqualTo(0); + assertThat(gb.getStandardEnumSet()).hasSize(0); } @Test @@ -157,7 +157,7 @@ public class BeanWrapperEnumTests { map.put("VALUE_1", 1); map.put("VALUE_2", 2); bw.setPropertyValue("standardEnumMap", map); - assertThat(gb.getStandardEnumMap().size()).isEqualTo(2); + assertThat(gb.getStandardEnumMap()).hasSize(2); assertThat(gb.getStandardEnumMap().get(CustomEnum.VALUE_1)).isEqualTo(1); assertThat(gb.getStandardEnumMap().get(CustomEnum.VALUE_2)).isEqualTo(2); } @@ -169,7 +169,7 @@ public class BeanWrapperEnumTests { bw.setAutoGrowNestedPaths(true); assertThat(gb.getStandardEnumMap()).isNull(); bw.setPropertyValue("standardEnumMap[VALUE_1]", 1); - assertThat(gb.getStandardEnumMap().size()).isEqualTo(1); + assertThat(gb.getStandardEnumMap()).hasSize(1); assertThat(gb.getStandardEnumMap().get(CustomEnum.VALUE_1)).isEqualTo(1); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java index b3230e53e0e..1cf25a2022e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java @@ -103,14 +103,14 @@ public class BeanFactoryUtilsTests { public void testHierarchicalNamesWithNoMatch() { List names = Arrays.asList( BeanFactoryUtils.beanNamesForTypeIncludingAncestors(this.listableBeanFactory, NoOp.class)); - assertThat(names.size()).isEqualTo(0); + assertThat(names).hasSize(0); } @Test public void testHierarchicalNamesWithMatchOnlyInRoot() { List names = Arrays.asList( BeanFactoryUtils.beanNamesForTypeIncludingAncestors(this.listableBeanFactory, IndexedTestBean.class)); - assertThat(names.size()).isEqualTo(1); + assertThat(names).hasSize(1); assertThat(names.contains("indexedBean")).isTrue(); // Distinguish from default ListableBeanFactory behavior assertThat(listableBeanFactory.getBeanNamesForType(IndexedTestBean.class).length == 0).isTrue(); @@ -121,7 +121,7 @@ public class BeanFactoryUtilsTests { List names = Arrays.asList( BeanFactoryUtils.beanNamesForTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class)); // includes 2 TestBeans from FactoryBeans (DummyFactory definitions) - assertThat(names.size()).isEqualTo(4); + assertThat(names).hasSize(4); assertThat(names.contains("test")).isTrue(); assertThat(names.contains("test3")).isTrue(); assertThat(names.contains("testFactory1")).isTrue(); @@ -150,7 +150,7 @@ public class BeanFactoryUtilsTests { lbf.addBean("t4", t4); Map beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(lbf, ITestBean.class, true, true); - assertThat(beans.size()).isEqualTo(4); + assertThat(beans).hasSize(4); assertThat(beans.get("t1")).isEqualTo(t1); assertThat(beans.get("t2")).isEqualTo(t2); assertThat(beans.get("t3")).isEqualTo(t3.getObject()); @@ -158,12 +158,12 @@ public class BeanFactoryUtilsTests { assertThat(condition).isTrue(); beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(lbf, DummyFactory.class, true, true); - assertThat(beans.size()).isEqualTo(2); + assertThat(beans).hasSize(2); assertThat(beans.get("&t3")).isEqualTo(t3); assertThat(beans.get("&t4")).isEqualTo(t4); beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(lbf, FactoryBean.class, true, true); - assertThat(beans.size()).isEqualTo(2); + assertThat(beans).hasSize(2); assertThat(beans.get("&t3")).isEqualTo(t3); assertThat(beans.get("&t4")).isEqualTo(t4); } @@ -185,7 +185,7 @@ public class BeanFactoryUtilsTests { Map beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class, true, false); - assertThat(beans.size()).isEqualTo(6); + assertThat(beans).hasSize(6); assertThat(beans.get("test3")).isEqualTo(test3); assertThat(beans.get("test")).isEqualTo(test); assertThat(beans.get("t1")).isEqualTo(t1); @@ -199,7 +199,7 @@ public class BeanFactoryUtilsTests { beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class, false, true); Object testFactory1 = this.listableBeanFactory.getBean("testFactory1"); - assertThat(beans.size()).isEqualTo(5); + assertThat(beans).hasSize(5); assertThat(beans.get("test")).isEqualTo(test); assertThat(beans.get("testFactory1")).isEqualTo(testFactory1); assertThat(beans.get("t1")).isEqualTo(t1); @@ -207,7 +207,7 @@ public class BeanFactoryUtilsTests { assertThat(beans.get("t3")).isEqualTo(t3.getObject()); beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class, true, true); - assertThat(beans.size()).isEqualTo(8); + assertThat(beans).hasSize(8); assertThat(beans.get("test3")).isEqualTo(test3); assertThat(beans.get("test")).isEqualTo(test); assertThat(beans.get("testFactory1")).isEqualTo(testFactory1); @@ -220,14 +220,14 @@ public class BeanFactoryUtilsTests { assertThat(condition).isTrue(); beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, DummyFactory.class, true, true); - assertThat(beans.size()).isEqualTo(4); + assertThat(beans).hasSize(4); assertThat(beans.get("&testFactory1")).isEqualTo(this.listableBeanFactory.getBean("&testFactory1")); assertThat(beans.get("&testFactory2")).isEqualTo(this.listableBeanFactory.getBean("&testFactory2")); assertThat(beans.get("&t3")).isEqualTo(t3); assertThat(beans.get("&t4")).isEqualTo(t4); beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, FactoryBean.class, true, true); - assertThat(beans.size()).isEqualTo(4); + assertThat(beans).hasSize(4); assertThat(beans.get("&testFactory1")).isEqualTo(this.listableBeanFactory.getBean("&testFactory1")); assertThat(beans.get("&testFactory2")).isEqualTo(this.listableBeanFactory.getBean("&testFactory2")); assertThat(beans.get("&t3")).isEqualTo(t3); @@ -241,22 +241,22 @@ public class BeanFactoryUtilsTests { Map beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class, true, false); - assertThat(beans.size()).isEqualTo(2); + assertThat(beans).hasSize(2); assertThat(beans.get("test3")).isEqualTo(test3); assertThat(beans.get("test")).isEqualTo(test); beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class, false, false); - assertThat(beans.size()).isEqualTo(1); + assertThat(beans).hasSize(1); assertThat(beans.get("test")).isEqualTo(test); beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class, false, true); Object testFactory1 = this.listableBeanFactory.getBean("testFactory1"); - assertThat(beans.size()).isEqualTo(2); + assertThat(beans).hasSize(2); assertThat(beans.get("test")).isEqualTo(test); assertThat(beans.get("testFactory1")).isEqualTo(testFactory1); beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class, true, true); - assertThat(beans.size()).isEqualTo(4); + assertThat(beans).hasSize(4); assertThat(beans.get("test3")).isEqualTo(test3); assertThat(beans.get("test")).isEqualTo(test); assertThat(beans.get("testFactory1")).isEqualTo(testFactory1); @@ -264,12 +264,12 @@ public class BeanFactoryUtilsTests { assertThat(condition).isTrue(); beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, DummyFactory.class, true, true); - assertThat(beans.size()).isEqualTo(2); + assertThat(beans).hasSize(2); assertThat(beans.get("&testFactory1")).isEqualTo(this.listableBeanFactory.getBean("&testFactory1")); assertThat(beans.get("&testFactory2")).isEqualTo(this.listableBeanFactory.getBean("&testFactory2")); beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, FactoryBean.class, true, true); - assertThat(beans.size()).isEqualTo(2); + assertThat(beans).hasSize(2); assertThat(beans.get("&testFactory1")).isEqualTo(this.listableBeanFactory.getBean("&testFactory1")); assertThat(beans.get("&testFactory2")).isEqualTo(this.listableBeanFactory.getBean("&testFactory2")); } @@ -278,14 +278,14 @@ public class BeanFactoryUtilsTests { public void testHierarchicalNamesForAnnotationWithNoMatch() { List names = Arrays.asList( BeanFactoryUtils.beanNamesForAnnotationIncludingAncestors(this.listableBeanFactory, Override.class)); - assertThat(names.size()).isEqualTo(0); + assertThat(names).hasSize(0); } @Test public void testHierarchicalNamesForAnnotationWithMatchOnlyInRoot() { List names = Arrays.asList( BeanFactoryUtils.beanNamesForAnnotationIncludingAncestors(this.listableBeanFactory, TestAnnotation.class)); - assertThat(names.size()).isEqualTo(1); + assertThat(names).hasSize(1); assertThat(names.contains("annotatedBean")).isTrue(); // Distinguish from default ListableBeanFactory behavior assertThat(listableBeanFactory.getBeanNamesForAnnotation(TestAnnotation.class).length == 0).isTrue(); @@ -297,7 +297,7 @@ public class BeanFactoryUtilsTests { this.listableBeanFactory.registerSingleton("anotherAnnotatedBean", annotatedBean); List names = Arrays.asList( BeanFactoryUtils.beanNamesForAnnotationIncludingAncestors(this.listableBeanFactory, TestAnnotation.class)); - assertThat(names.size()).isEqualTo(2); + assertThat(names).hasSize(2); assertThat(names.contains("annotatedBean")).isTrue(); assertThat(names.contains("anotherAnnotatedBean")).isTrue(); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java index cbf2ff49dac..affdb618a6a 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java @@ -1075,12 +1075,12 @@ class DefaultListableBeanFactoryTests { assertThat(test.getSpouse()).isEqualTo(singletonObject); Map beansOfType = lbf.getBeansOfType(TestBean.class, false, true); - assertThat(beansOfType.size()).isEqualTo(2); + assertThat(beansOfType).hasSize(2); assertThat(beansOfType.containsValue(test)).isTrue(); assertThat(beansOfType.containsValue(singletonObject)).isTrue(); beansOfType = lbf.getBeansOfType(null, false, true); - assertThat(beansOfType.size()).isEqualTo(2); + assertThat(beansOfType).hasSize(2); Iterator beanNames = lbf.getBeanNamesIterator(); assertThat(beanNames.next()).isEqualTo("test"); @@ -1113,7 +1113,7 @@ class DefaultListableBeanFactoryTests { assertThat(test.getSpouse()).isEqualTo(singletonObject); Map beansOfType = lbf.getBeansOfType(TestBean.class, false, true); - assertThat(beansOfType.size()).isEqualTo(2); + assertThat(beansOfType).hasSize(2); assertThat(beansOfType.containsValue(test)).isTrue(); assertThat(beansOfType.containsValue(singletonObject)).isTrue(); @@ -1123,7 +1123,7 @@ class DefaultListableBeanFactoryTests { assertThat(beanNames.next()).isEqualTo("test"); assertThat(beanNames.next()).isEqualTo("singletonObject"); assertThat(beanNames.hasNext()).isFalse(); - assertThat(beansOfType.size()).isEqualTo(2); + assertThat(beansOfType).hasSize(2); assertThat(lbf.containsSingleton("test")).isTrue(); assertThat(lbf.containsSingleton("singletonObject")).isTrue(); @@ -1669,18 +1669,18 @@ class DefaultListableBeanFactoryTests { for (ConstructorDependency instance : provider) { resolved.add(instance); } - assertThat(resolved.size()).isEqualTo(2); + assertThat(resolved).hasSize(2); assertThat(resolved.contains(lbf.getBean("bd1"))).isTrue(); assertThat(resolved.contains(lbf.getBean("bd2"))).isTrue(); resolved = new HashSet<>(); provider.forEach(resolved::add); - assertThat(resolved.size()).isEqualTo(2); + assertThat(resolved).hasSize(2); assertThat(resolved.contains(lbf.getBean("bd1"))).isTrue(); assertThat(resolved.contains(lbf.getBean("bd2"))).isTrue(); resolved = provider.stream().collect(Collectors.toSet()); - assertThat(resolved.size()).isEqualTo(2); + assertThat(resolved).hasSize(2); assertThat(resolved.contains(lbf.getBean("bd1"))).isTrue(); assertThat(resolved.contains(lbf.getBean("bd2"))).isTrue(); } @@ -1718,18 +1718,18 @@ class DefaultListableBeanFactoryTests { for (ConstructorDependency instance : provider) { resolved.add(instance); } - assertThat(resolved.size()).isEqualTo(2); + assertThat(resolved).hasSize(2); assertThat(resolved.contains(lbf.getBean("bd1"))).isTrue(); assertThat(resolved.contains(lbf.getBean("bd2"))).isTrue(); resolved = new HashSet<>(); provider.forEach(resolved::add); - assertThat(resolved.size()).isEqualTo(2); + assertThat(resolved).hasSize(2); assertThat(resolved.contains(lbf.getBean("bd1"))).isTrue(); assertThat(resolved.contains(lbf.getBean("bd2"))).isTrue(); resolved = provider.stream().collect(Collectors.toSet()); - assertThat(resolved.size()).isEqualTo(2); + assertThat(resolved).hasSize(2); assertThat(resolved.contains(lbf.getBean("bd1"))).isTrue(); assertThat(resolved.contains(lbf.getBean("bd2"))).isTrue(); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java index e9b72d71a5b..69f8dd85df6 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java @@ -411,13 +411,13 @@ public class AutowiredAnnotationBeanPostProcessorTests { assertThat(bean.getTestBean3()).isSameAs(tb); assertThat(bean.getTestBean4()).isSameAs(tb); assertThat(bean.getIndexedTestBean()).isSameAs(itb); - assertThat(bean.getNestedTestBeans().size()).isEqualTo(2); + assertThat(bean.getNestedTestBeans()).hasSize(2); assertThat(bean.getNestedTestBeans().get(0)).isSameAs(ntb1); assertThat(bean.getNestedTestBeans().get(1)).isSameAs(ntb2); - assertThat(bean.nestedTestBeansSetter.size()).isEqualTo(2); + assertThat(bean.nestedTestBeansSetter).hasSize(2); assertThat(bean.nestedTestBeansSetter.get(0)).isSameAs(ntb1); assertThat(bean.nestedTestBeansSetter.get(1)).isSameAs(ntb2); - assertThat(bean.nestedTestBeansField.size()).isEqualTo(2); + assertThat(bean.nestedTestBeansField).hasSize(2); assertThat(bean.nestedTestBeansField.get(0)).isSameAs(ntb1); assertThat(bean.nestedTestBeansField.get(1)).isSameAs(ntb2); } @@ -442,11 +442,11 @@ public class AutowiredAnnotationBeanPostProcessorTests { assertThat(bean.getTestBean3()).isSameAs(tb); assertThat(bean.getTestBean4()).isSameAs(tb); assertThat(bean.getIndexedTestBean()).isSameAs(itb); - assertThat(bean.getNestedTestBeans().size()).isEqualTo(1); + assertThat(bean.getNestedTestBeans()).hasSize(1); assertThat(bean.getNestedTestBeans().get(0)).isSameAs(ntb1); - assertThat(bean.nestedTestBeansSetter.size()).isEqualTo(1); + assertThat(bean.nestedTestBeansSetter).hasSize(1); assertThat(bean.nestedTestBeansSetter.get(0)).isSameAs(ntb1); - assertThat(bean.nestedTestBeansField.size()).isEqualTo(1); + assertThat(bean.nestedTestBeansField).hasSize(1); assertThat(bean.nestedTestBeansField.get(0)).isSameAs(ntb1); } @@ -554,13 +554,13 @@ public class AutowiredAnnotationBeanPostProcessorTests { assertThat(bean.getTestBean3()).isSameAs(tb); assertThat(bean.getTestBean4()).isSameAs(tb); assertThat(bean.getIndexedTestBean()).isSameAs(itb); - assertThat(bean.getNestedTestBeans().size()).isEqualTo(2); + assertThat(bean.getNestedTestBeans()).hasSize(2); assertThat(bean.getNestedTestBeans().get(0)).isSameAs(ntb2); assertThat(bean.getNestedTestBeans().get(1)).isSameAs(ntb1); - assertThat(bean.nestedTestBeansSetter.size()).isEqualTo(2); + assertThat(bean.nestedTestBeansSetter).hasSize(2); assertThat(bean.nestedTestBeansSetter.get(0)).isSameAs(ntb2); assertThat(bean.nestedTestBeansSetter.get(1)).isSameAs(ntb1); - assertThat(bean.nestedTestBeansField.size()).isEqualTo(2); + assertThat(bean.nestedTestBeansField).hasSize(2); assertThat(bean.nestedTestBeansField.get(0)).isSameAs(ntb2); assertThat(bean.nestedTestBeansField.get(1)).isSameAs(ntb1); } @@ -587,13 +587,13 @@ public class AutowiredAnnotationBeanPostProcessorTests { assertThat(bean.getTestBean3()).isSameAs(tb); assertThat(bean.getTestBean4()).isSameAs(tb); assertThat(bean.getIndexedTestBean()).isSameAs(itb); - assertThat(bean.getNestedTestBeans().size()).isEqualTo(2); + assertThat(bean.getNestedTestBeans()).hasSize(2); assertThat(bean.getNestedTestBeans().get(0)).isSameAs(ntb2); assertThat(bean.getNestedTestBeans().get(1)).isSameAs(ntb1); - assertThat(bean.nestedTestBeansSetter.size()).isEqualTo(2); + assertThat(bean.nestedTestBeansSetter).hasSize(2); assertThat(bean.nestedTestBeansSetter.get(0)).isSameAs(ntb2); assertThat(bean.nestedTestBeansSetter.get(1)).isSameAs(ntb1); - assertThat(bean.nestedTestBeansField.size()).isEqualTo(2); + assertThat(bean.nestedTestBeansField).hasSize(2); assertThat(bean.nestedTestBeansField.get(0)).isSameAs(ntb2); assertThat(bean.nestedTestBeansField.get(1)).isSameAs(ntb1); } @@ -798,7 +798,7 @@ public class AutowiredAnnotationBeanPostProcessorTests { ConstructorsCollectionResourceInjectionBean bean = (ConstructorsCollectionResourceInjectionBean) bf.getBean("annotatedBean"); assertThat(bean.getTestBean3()).isNull(); assertThat(bean.getTestBean4()).isSameAs(tb); - assertThat(bean.getNestedTestBeans().size()).isEqualTo(1); + assertThat(bean.getNestedTestBeans()).hasSize(1); assertThat(bean.getNestedTestBeans().get(0)).isSameAs(ntb2); Map map = bf.getBeansOfType(NestedTestBean.class); @@ -820,7 +820,7 @@ public class AutowiredAnnotationBeanPostProcessorTests { ConstructorsCollectionResourceInjectionBean bean = (ConstructorsCollectionResourceInjectionBean) bf.getBean("annotatedBean"); assertThat(bean.getTestBean3()).isNull(); assertThat(bean.getTestBean4()).isSameAs(tb); - assertThat(bean.getNestedTestBeans().size()).isEqualTo(2); + assertThat(bean.getNestedTestBeans()).hasSize(2); assertThat(bean.getNestedTestBeans().get(0)).isSameAs(ntb1); assertThat(bean.getNestedTestBeans().get(1)).isSameAs(ntb2); } @@ -856,7 +856,7 @@ public class AutowiredAnnotationBeanPostProcessorTests { ConstructorsCollectionResourceInjectionBean bean = (ConstructorsCollectionResourceInjectionBean) bf.getBean("annotatedBean"); assertThat(bean.getTestBean3()).isNull(); assertThat(bean.getTestBean4()).isSameAs(tb); - assertThat(bean.getNestedTestBeans().size()).isEqualTo(2); + assertThat(bean.getNestedTestBeans()).hasSize(2); assertThat(bean.getNestedTestBeans().get(0)).isSameAs(ntb2); assertThat(bean.getNestedTestBeans().get(1)).isSameAs(ntb1); } @@ -873,7 +873,7 @@ public class AutowiredAnnotationBeanPostProcessorTests { SingleConstructorVarargBean bean = (SingleConstructorVarargBean) bf.getBean("annotatedBean"); assertThat(bean.getTestBean()).isSameAs(tb); - assertThat(bean.getNestedTestBeans().size()).isEqualTo(2); + assertThat(bean.getNestedTestBeans()).hasSize(2); assertThat(bean.getNestedTestBeans().get(0)).isSameAs(ntb2); assertThat(bean.getNestedTestBeans().get(1)).isSameAs(ntb1); } @@ -902,7 +902,7 @@ public class AutowiredAnnotationBeanPostProcessorTests { SingleConstructorRequiredCollectionBean bean = (SingleConstructorRequiredCollectionBean) bf.getBean("annotatedBean"); assertThat(bean.getTestBean()).isSameAs(tb); - assertThat(bean.getNestedTestBeans().size()).isEqualTo(2); + assertThat(bean.getNestedTestBeans()).hasSize(2); assertThat(bean.getNestedTestBeans().get(0)).isSameAs(ntb2); assertThat(bean.getNestedTestBeans().get(1)).isSameAs(ntb1); } @@ -931,7 +931,7 @@ public class AutowiredAnnotationBeanPostProcessorTests { SingleConstructorOptionalCollectionBean bean = (SingleConstructorOptionalCollectionBean) bf.getBean("annotatedBean"); assertThat(bean.getTestBean()).isSameAs(tb); - assertThat(bean.getNestedTestBeans().size()).isEqualTo(2); + assertThat(bean.getNestedTestBeans()).hasSize(2); assertThat(bean.getNestedTestBeans().get(0)).isSameAs(ntb2); assertThat(bean.getNestedTestBeans().get(1)).isSameAs(ntb1); } @@ -996,12 +996,12 @@ public class AutowiredAnnotationBeanPostProcessorTests { bf.registerBeanDefinition("testBean2", tb2); MapConstructorInjectionBean bean = (MapConstructorInjectionBean) bf.getBean("annotatedBean"); - assertThat(bean.getTestBeanMap().size()).isEqualTo(1); + assertThat(bean.getTestBeanMap()).hasSize(1); assertThat(bean.getTestBeanMap().get("testBean1")).isSameAs(tb1); assertThat(bean.getTestBeanMap().get("testBean2")).isNull(); bean = (MapConstructorInjectionBean) bf.getBean("annotatedBean"); - assertThat(bean.getTestBeanMap().size()).isEqualTo(1); + assertThat(bean.getTestBeanMap()).hasSize(1); assertThat(bean.getTestBeanMap().get("testBean1")).isSameAs(tb1); assertThat(bean.getTestBeanMap().get("testBean2")).isNull(); } @@ -1017,14 +1017,14 @@ public class AutowiredAnnotationBeanPostProcessorTests { bf.registerSingleton("testBean2", tb2); MapFieldInjectionBean bean = (MapFieldInjectionBean) bf.getBean("annotatedBean"); - assertThat(bean.getTestBeanMap().size()).isEqualTo(2); + assertThat(bean.getTestBeanMap()).hasSize(2); assertThat(bean.getTestBeanMap().keySet().contains("testBean1")).isTrue(); assertThat(bean.getTestBeanMap().keySet().contains("testBean2")).isTrue(); assertThat(bean.getTestBeanMap().values().contains(tb1)).isTrue(); assertThat(bean.getTestBeanMap().values().contains(tb2)).isTrue(); bean = (MapFieldInjectionBean) bf.getBean("annotatedBean"); - assertThat(bean.getTestBeanMap().size()).isEqualTo(2); + assertThat(bean.getTestBeanMap()).hasSize(2); assertThat(bean.getTestBeanMap().keySet().contains("testBean1")).isTrue(); assertThat(bean.getTestBeanMap().keySet().contains("testBean2")).isTrue(); assertThat(bean.getTestBeanMap().values().contains(tb1)).isTrue(); @@ -1040,13 +1040,13 @@ public class AutowiredAnnotationBeanPostProcessorTests { bf.registerSingleton("testBean", tb); MapMethodInjectionBean bean = (MapMethodInjectionBean) bf.getBean("annotatedBean"); - assertThat(bean.getTestBeanMap().size()).isEqualTo(1); + assertThat(bean.getTestBeanMap()).hasSize(1); assertThat(bean.getTestBeanMap().keySet().contains("testBean")).isTrue(); assertThat(bean.getTestBeanMap().values().contains(tb)).isTrue(); assertThat(bean.getTestBean()).isSameAs(tb); bean = (MapMethodInjectionBean) bf.getBean("annotatedBean"); - assertThat(bean.getTestBeanMap().size()).isEqualTo(1); + assertThat(bean.getTestBeanMap()).hasSize(1); assertThat(bean.getTestBeanMap().keySet().contains("testBean")).isTrue(); assertThat(bean.getTestBeanMap().values().contains(tb)).isTrue(); assertThat(bean.getTestBean()).isSameAs(tb); @@ -1072,7 +1072,7 @@ public class AutowiredAnnotationBeanPostProcessorTests { MapMethodInjectionBean bean = (MapMethodInjectionBean) bf.getBean("annotatedBean"); TestBean tb = (TestBean) bf.getBean("testBean1"); - assertThat(bean.getTestBeanMap().size()).isEqualTo(1); + assertThat(bean.getTestBeanMap()).hasSize(1); assertThat(bean.getTestBeanMap().keySet().contains("testBean1")).isTrue(); assertThat(bean.getTestBeanMap().values().contains(tb)).isTrue(); assertThat(bean.getTestBean()).isSameAs(tb); @@ -1215,7 +1215,7 @@ public class AutowiredAnnotationBeanPostProcessorTests { SelfInjectionBean bean = (SelfInjectionBean) bf.getBean("annotatedBean"); SelfInjectionBean bean2 = (SelfInjectionBean) bf.getBean("annotatedBean2"); assertThat(bean.reference).isSameAs(bean2); - assertThat(bean.referenceCollection.size()).isEqualTo(1); + assertThat(bean.referenceCollection).hasSize(1); assertThat(bean.referenceCollection.get(0)).isSameAs(bean2); } @@ -1326,16 +1326,16 @@ public class AutowiredAnnotationBeanPostProcessorTests { assertThat(bean.consumeUniqueTestBean()).isEqualTo(bf.getBean("testBean")); List testBeans = bean.iterateTestBeans(); - assertThat(testBeans.size()).isEqualTo(1); + assertThat(testBeans).hasSize(1); assertThat(testBeans.contains(bf.getBean("testBean"))).isTrue(); testBeans = bean.forEachTestBeans(); - assertThat(testBeans.size()).isEqualTo(1); + assertThat(testBeans).hasSize(1); assertThat(testBeans.contains(bf.getBean("testBean"))).isTrue(); testBeans = bean.streamTestBeans(); - assertThat(testBeans.size()).isEqualTo(1); + assertThat(testBeans).hasSize(1); assertThat(testBeans.contains(bf.getBean("testBean"))).isTrue(); testBeans = bean.sortedTestBeans(); - assertThat(testBeans.size()).isEqualTo(1); + assertThat(testBeans).hasSize(1); assertThat(testBeans.contains(bf.getBean("testBean"))).isTrue(); } @@ -1354,16 +1354,16 @@ public class AutowiredAnnotationBeanPostProcessorTests { assertThat(bean.consumeUniqueTestBean()).isEqualTo(bf.getBean("testBean")); List testBeans = bean.iterateTestBeans(); - assertThat(testBeans.size()).isEqualTo(1); + assertThat(testBeans).hasSize(1); assertThat(testBeans.contains(bf.getBean("testBean"))).isTrue(); testBeans = bean.forEachTestBeans(); - assertThat(testBeans.size()).isEqualTo(1); + assertThat(testBeans).hasSize(1); assertThat(testBeans.contains(bf.getBean("testBean"))).isTrue(); testBeans = bean.streamTestBeans(); - assertThat(testBeans.size()).isEqualTo(1); + assertThat(testBeans).hasSize(1); assertThat(testBeans.contains(bf.getBean("testBean"))).isTrue(); testBeans = bean.sortedTestBeans(); - assertThat(testBeans.size()).isEqualTo(1); + assertThat(testBeans).hasSize(1); assertThat(testBeans.contains(bf.getBean("testBean"))).isTrue(); } @@ -1405,19 +1405,19 @@ public class AutowiredAnnotationBeanPostProcessorTests { assertThat(bean.consumeUniqueTestBean()).isNull(); List testBeans = bean.iterateTestBeans(); - assertThat(testBeans.size()).isEqualTo(2); + assertThat(testBeans).hasSize(2); assertThat(testBeans.get(0)).isSameAs(bf.getBean("testBean1")); assertThat(testBeans.get(1)).isSameAs(bf.getBean("testBean2")); testBeans = bean.forEachTestBeans(); - assertThat(testBeans.size()).isEqualTo(2); + assertThat(testBeans).hasSize(2); assertThat(testBeans.get(0)).isSameAs(bf.getBean("testBean1")); assertThat(testBeans.get(1)).isSameAs(bf.getBean("testBean2")); testBeans = bean.streamTestBeans(); - assertThat(testBeans.size()).isEqualTo(2); + assertThat(testBeans).hasSize(2); assertThat(testBeans.get(0)).isSameAs(bf.getBean("testBean1")); assertThat(testBeans.get(1)).isSameAs(bf.getBean("testBean2")); testBeans = bean.sortedTestBeans(); - assertThat(testBeans.size()).isEqualTo(2); + assertThat(testBeans).hasSize(2); assertThat(testBeans.get(0)).isSameAs(bf.getBean("testBean1")); assertThat(testBeans.get(1)).isSameAs(bf.getBean("testBean2")); } @@ -1443,19 +1443,19 @@ public class AutowiredAnnotationBeanPostProcessorTests { assertThat(bf.containsSingleton("testBean2")).isFalse(); List testBeans = bean.iterateTestBeans(); - assertThat(testBeans.size()).isEqualTo(2); + assertThat(testBeans).hasSize(2); assertThat(testBeans.get(0)).isSameAs(bf.getBean("testBean1")); assertThat(testBeans.get(1)).isSameAs(bf.getBean("testBean2")); testBeans = bean.forEachTestBeans(); - assertThat(testBeans.size()).isEqualTo(2); + assertThat(testBeans).hasSize(2); assertThat(testBeans.get(0)).isSameAs(bf.getBean("testBean1")); assertThat(testBeans.get(1)).isSameAs(bf.getBean("testBean2")); testBeans = bean.streamTestBeans(); - assertThat(testBeans.size()).isEqualTo(2); + assertThat(testBeans).hasSize(2); assertThat(testBeans.get(0)).isSameAs(bf.getBean("testBean1")); assertThat(testBeans.get(1)).isSameAs(bf.getBean("testBean2")); testBeans = bean.sortedTestBeans(); - assertThat(testBeans.size()).isEqualTo(2); + assertThat(testBeans).hasSize(2); assertThat(testBeans.get(0)).isSameAs(bf.getBean("testBean2")); assertThat(testBeans.get(1)).isSameAs(bf.getBean("testBean1")); } @@ -1474,7 +1474,7 @@ public class AutowiredAnnotationBeanPostProcessorTests { ObjectProviderInjectionBean bean = (ObjectProviderInjectionBean) bf.getBean("annotatedBean"); List testBeans = bean.sortedTestBeans(); - assertThat(testBeans.size()).isEqualTo(2); + assertThat(testBeans).hasSize(2); assertThat(testBeans.get(0)).isSameAs(bf.getBean("testBean2")); assertThat(testBeans.get(1)).isSameAs(bf.getBean("testBean1")); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java index 079f3955603..1e1253a4d9e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java @@ -195,7 +195,7 @@ public class InjectAnnotationBeanPostProcessorTests { ConstructorsCollectionResourceInjectionBean bean = (ConstructorsCollectionResourceInjectionBean) bf.getBean("annotatedBean"); assertThat(bean.getTestBean3()).isNull(); assertThat(bean.getTestBean4()).isSameAs(tb); - assertThat(bean.getNestedTestBeans().size()).isEqualTo(2); + assertThat(bean.getNestedTestBeans()).hasSize(2); assertThat(bean.getNestedTestBeans().get(0)).isSameAs(ntb1); assertThat(bean.getNestedTestBeans().get(1)).isSameAs(ntb2); } @@ -222,14 +222,14 @@ public class InjectAnnotationBeanPostProcessorTests { bf.registerSingleton("testBean2", tb1); MapConstructorInjectionBean bean = (MapConstructorInjectionBean) bf.getBean("annotatedBean"); - assertThat(bean.getTestBeanMap().size()).isEqualTo(2); + assertThat(bean.getTestBeanMap()).hasSize(2); assertThat(bean.getTestBeanMap().keySet().contains("testBean1")).isTrue(); assertThat(bean.getTestBeanMap().keySet().contains("testBean2")).isTrue(); assertThat(bean.getTestBeanMap().values().contains(tb1)).isTrue(); assertThat(bean.getTestBeanMap().values().contains(tb2)).isTrue(); bean = (MapConstructorInjectionBean) bf.getBean("annotatedBean"); - assertThat(bean.getTestBeanMap().size()).isEqualTo(2); + assertThat(bean.getTestBeanMap()).hasSize(2); assertThat(bean.getTestBeanMap().keySet().contains("testBean1")).isTrue(); assertThat(bean.getTestBeanMap().keySet().contains("testBean2")).isTrue(); assertThat(bean.getTestBeanMap().values().contains(tb1)).isTrue(); @@ -247,14 +247,14 @@ public class InjectAnnotationBeanPostProcessorTests { bf.registerSingleton("testBean2", tb1); MapFieldInjectionBean bean = (MapFieldInjectionBean) bf.getBean("annotatedBean"); - assertThat(bean.getTestBeanMap().size()).isEqualTo(2); + assertThat(bean.getTestBeanMap()).hasSize(2); assertThat(bean.getTestBeanMap().keySet().contains("testBean1")).isTrue(); assertThat(bean.getTestBeanMap().keySet().contains("testBean2")).isTrue(); assertThat(bean.getTestBeanMap().values().contains(tb1)).isTrue(); assertThat(bean.getTestBeanMap().values().contains(tb2)).isTrue(); bean = (MapFieldInjectionBean) bf.getBean("annotatedBean"); - assertThat(bean.getTestBeanMap().size()).isEqualTo(2); + assertThat(bean.getTestBeanMap()).hasSize(2); assertThat(bean.getTestBeanMap().keySet().contains("testBean1")).isTrue(); assertThat(bean.getTestBeanMap().keySet().contains("testBean2")).isTrue(); assertThat(bean.getTestBeanMap().values().contains(tb1)).isTrue(); @@ -270,13 +270,13 @@ public class InjectAnnotationBeanPostProcessorTests { bf.registerSingleton("testBean", tb); MapMethodInjectionBean bean = (MapMethodInjectionBean) bf.getBean("annotatedBean"); - assertThat(bean.getTestBeanMap().size()).isEqualTo(1); + assertThat(bean.getTestBeanMap()).hasSize(1); assertThat(bean.getTestBeanMap().keySet().contains("testBean")).isTrue(); assertThat(bean.getTestBeanMap().values().contains(tb)).isTrue(); assertThat(bean.getTestBean()).isSameAs(tb); bean = (MapMethodInjectionBean) bf.getBean("annotatedBean"); - assertThat(bean.getTestBeanMap().size()).isEqualTo(1); + assertThat(bean.getTestBeanMap()).hasSize(1); assertThat(bean.getTestBeanMap().keySet().contains("testBean")).isTrue(); assertThat(bean.getTestBeanMap().values().contains(tb)).isTrue(); assertThat(bean.getTestBean()).isSameAs(tb); @@ -301,7 +301,7 @@ public class InjectAnnotationBeanPostProcessorTests { MapMethodInjectionBean bean = (MapMethodInjectionBean) bf.getBean("annotatedBean"); TestBean tb = (TestBean) bf.getBean("testBean1"); - assertThat(bean.getTestBeanMap().size()).isEqualTo(1); + assertThat(bean.getTestBeanMap()).hasSize(1); assertThat(bean.getTestBeanMap().keySet().contains("testBean1")).isTrue(); assertThat(bean.getTestBeanMap().values().contains(tb)).isTrue(); assertThat(bean.getTestBean()).isSameAs(tb); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java index f7a52dbcdf0..49b6ca23102 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java @@ -399,19 +399,19 @@ public class PropertyResourceConfigurerTests { assertThat(tb1.getName()).isEqualTo("namemyvarmyvar${"); assertThat(tb2.getName()).isEqualTo("myvarname98"); assertThat(tb1.getSpouse()).isEqualTo(tb2); - assertThat(tb1.getSomeMap().size()).isEqualTo(1); + assertThat(tb1.getSomeMap()).hasSize(1); assertThat(tb1.getSomeMap().get("myKey")).isEqualTo("myValue"); assertThat(tb2.getStringArray().length).isEqualTo(2); assertThat(tb2.getStringArray()[0]).isEqualTo(System.getProperty("os.name")); assertThat(tb2.getStringArray()[1]).isEqualTo("98"); - assertThat(tb2.getFriends().size()).isEqualTo(2); + assertThat(tb2.getFriends()).hasSize(2); assertThat(tb2.getFriends().iterator().next()).isEqualTo("na98me"); assertThat(tb2.getFriends().toArray()[1]).isEqualTo(tb2); - assertThat(tb2.getSomeSet().size()).isEqualTo(3); + assertThat(tb2.getSomeSet()).hasSize(3); assertThat(tb2.getSomeSet().contains("na98me")).isTrue(); assertThat(tb2.getSomeSet().contains(tb2)).isTrue(); assertThat(tb2.getSomeSet().contains(98)).isTrue(); - assertThat(tb2.getSomeMap().size()).isEqualTo(6); + assertThat(tb2.getSomeMap()).hasSize(6); assertThat(tb2.getSomeMap().get("key98")).isEqualTo("98"); assertThat(tb2.getSomeMap().get("key98ref")).isEqualTo(tb2); assertThat(tb2.getSomeMap().get("key1")).isEqualTo(tb2); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlMapFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlMapFactoryBeanTests.java index b5d4459612a..b9a6adcdc13 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlMapFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlMapFactoryBeanTests.java @@ -47,7 +47,7 @@ public class YamlMapFactoryBeanTests { public void testSetIgnoreResourceNotFound() { this.factory.setResolutionMethod(YamlMapFactoryBean.ResolutionMethod.OVERRIDE_AND_IGNORE); this.factory.setResources(new FileSystemResource("non-exsitent-file.yml")); - assertThat(this.factory.getObject().size()).isEqualTo(0); + assertThat(this.factory.getObject()).hasSize(0); } @Test @@ -61,7 +61,7 @@ public class YamlMapFactoryBeanTests { @Test public void testGetObject() { this.factory.setResources(new ByteArrayResource("foo: bar".getBytes())); - assertThat(this.factory.getObject().size()).isEqualTo(1); + assertThat(this.factory.getObject()).hasSize(1); } @SuppressWarnings("unchecked") @@ -70,8 +70,8 @@ public class YamlMapFactoryBeanTests { this.factory.setResources(new ByteArrayResource("foo:\n bar: spam".getBytes()), new ByteArrayResource("foo:\n spam: bar".getBytes())); - assertThat(this.factory.getObject().size()).isEqualTo(1); - assertThat(((Map) this.factory.getObject().get("foo")).size()).isEqualTo(2); + assertThat(this.factory.getObject()).hasSize(1); + assertThat(((Map) this.factory.getObject().get("foo"))).hasSize(2); } @Test @@ -88,7 +88,7 @@ public class YamlMapFactoryBeanTests { } }, new ByteArrayResource("foo:\n spam: bar".getBytes())); - assertThat(this.factory.getObject().size()).isEqualTo(1); + assertThat(this.factory.getObject()).hasSize(1); } @Test @@ -96,7 +96,7 @@ public class YamlMapFactoryBeanTests { this.factory.setResources(new ByteArrayResource("foo:\n ? key1.key2\n : value".getBytes())); Map map = this.factory.getObject(); - assertThat(map.size()).isEqualTo(1); + assertThat(map).hasSize(1); assertThat(map.containsKey("foo")).isTrue(); Object object = map.get("foo"); boolean condition = object instanceof LinkedHashMap; @@ -112,14 +112,14 @@ public class YamlMapFactoryBeanTests { this.factory.setResources(new ByteArrayResource("foo:\n ? key1.key2\n : 3".getBytes())); Map map = this.factory.getObject(); - assertThat(map.size()).isEqualTo(1); + assertThat(map).hasSize(1); assertThat(map.containsKey("foo")).isTrue(); Object object = map.get("foo"); boolean condition = object instanceof LinkedHashMap; assertThat(condition).isTrue(); @SuppressWarnings("unchecked") Map sub = (Map) object; - assertThat(sub.size()).isEqualTo(1); + assertThat(sub).hasSize(1); assertThat(sub.get("key1.key2")).isEqualTo(3); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlProcessorTests.java index edb1f994f33..0b12b13ca42 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlProcessorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlProcessorTests.java @@ -52,7 +52,7 @@ class YamlProcessorTests { void arrayConvertedToIndexedBeanReference() { setYaml("foo: bar\nbar: [1,2,3]"); this.processor.process((properties, map) -> { - assertThat(properties.size()).isEqualTo(4); + assertThat(properties).hasSize(4); assertThat(properties.get("foo")).isEqualTo("bar"); assertThat(properties.getProperty("foo")).isEqualTo("bar"); assertThat(properties.get("bar[0]")).isEqualTo(1); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java index de770309e05..cdcf753e6e0 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java @@ -181,7 +181,7 @@ public class BeanDefinitionTests { RootBeanDefinition mergedBd = new RootBeanDefinition(bd); mergedBd.overrideFrom(childBd); assertThat(mergedBd.getConstructorArgumentValues().getArgumentCount()).isEqualTo(2); - assertThat(mergedBd.getPropertyValues().size()).isEqualTo(2); + assertThat(mergedBd.getPropertyValues()).hasSize(2); assertThat(mergedBd).isEqualTo(bd); mergedBd.getConstructorArgumentValues().getArgumentValue(1, null).setValue(9); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java index 5c6e0253631..a65718c67f0 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java @@ -166,7 +166,7 @@ class BeanFactoryGenericsTests { new ClassPathResource("genericBeanTests.xml", getClass())); GenericBean gb = (GenericBean) bf.getBean("listOfArrays"); - assertThat(gb.getListOfArrays().size()).isEqualTo(1); + assertThat(gb.getListOfArrays()).hasSize(1); String[] array = gb.getListOfArrays().get(0); assertThat(array).hasSize(2); assertThat(array[0]).isEqualTo("value1"); @@ -338,7 +338,7 @@ class BeanFactoryGenericsTests { assertThat(gb.getPlainMap()).hasSize(2); assertThat(gb.getPlainMap().get("1")).isEqualTo("0"); assertThat(gb.getPlainMap().get("2")).isEqualTo("3"); - assertThat(gb.getShortMap().size()).isEqualTo(2); + assertThat(gb.getShortMap()).hasSize(2); assertThat(gb.getShortMap().get(Short.valueOf("4"))).isEqualTo(5); assertThat(gb.getShortMap().get(Short.valueOf("6"))).isEqualTo(7); } @@ -361,7 +361,7 @@ class BeanFactoryGenericsTests { assertThat(gb.getPlainMap()).hasSize(2); assertThat(gb.getPlainMap().get("1")).isEqualTo("0"); assertThat(gb.getPlainMap().get("2")).isEqualTo("3"); - assertThat(gb.getShortMap().size()).isEqualTo(2); + assertThat(gb.getShortMap()).hasSize(2); assertThat(gb.getShortMap().get(Short.valueOf("1"))).isEqualTo(0); assertThat(gb.getShortMap().get(Short.valueOf("2"))).isEqualTo(3); } @@ -589,7 +589,7 @@ class BeanFactoryGenericsTests { new XmlBeanDefinitionReader(bf).loadBeanDefinitions( new ClassPathResource("genericBeanTests.xml", getClass())); List list = (List) bf.getBean("list"); - assertThat(list.size()).isEqualTo(1); + assertThat(list).hasSize(1); assertThat(list.get(0)).isEqualTo(new URL("http://localhost:8080")); } @@ -599,7 +599,7 @@ class BeanFactoryGenericsTests { new XmlBeanDefinitionReader(bf).loadBeanDefinitions( new ClassPathResource("genericBeanTests.xml", getClass())); Set set = (Set) bf.getBean("set"); - assertThat(set.size()).isEqualTo(1); + assertThat(set).hasSize(1); assertThat(set.iterator().next()).isEqualTo(new URL("http://localhost:8080")); } @@ -643,7 +643,7 @@ class BeanFactoryGenericsTests { new XmlBeanDefinitionReader(bf).loadBeanDefinitions( new ClassPathResource("genericBeanTests.xml", getClass())); UrlSet us = (UrlSet) bf.getBean("setBean"); - assertThat(us.size()).isEqualTo(1); + assertThat(us).hasSize(1); assertThat(us.iterator().next()).isEqualTo(new URL("https://www.springframework.org")); } @@ -879,17 +879,17 @@ class BeanFactoryGenericsTests { for (NumberStore instance : numberStoreProvider) { resolved.add(instance); } - assertThat(resolved.size()).isEqualTo(2); + assertThat(resolved).hasSize(2); assertThat(resolved.get(0)).isSameAs(bf.getBean("store1")); assertThat(resolved.get(1)).isSameAs(bf.getBean("store2")); resolved = numberStoreProvider.stream().toList(); - assertThat(resolved.size()).isEqualTo(2); + assertThat(resolved).hasSize(2); assertThat(resolved.get(0)).isSameAs(bf.getBean("store1")); assertThat(resolved.get(1)).isSameAs(bf.getBean("store2")); resolved = numberStoreProvider.orderedStream().toList(); - assertThat(resolved.size()).isEqualTo(2); + assertThat(resolved).hasSize(2); assertThat(resolved.get(0)).isSameAs(bf.getBean("store2")); assertThat(resolved.get(1)).isSameAs(bf.getBean("store1")); @@ -897,30 +897,30 @@ class BeanFactoryGenericsTests { for (NumberStore instance : doubleStoreProvider) { resolved.add(instance); } - assertThat(resolved.size()).isEqualTo(1); + assertThat(resolved).hasSize(1); assertThat(resolved.contains(bf.getBean("store1"))).isTrue(); resolved = doubleStoreProvider.stream().collect(Collectors.toList()); - assertThat(resolved.size()).isEqualTo(1); + assertThat(resolved).hasSize(1); assertThat(resolved.contains(bf.getBean("store1"))).isTrue(); resolved = doubleStoreProvider.orderedStream().collect(Collectors.toList()); - assertThat(resolved.size()).isEqualTo(1); + assertThat(resolved).hasSize(1); assertThat(resolved.contains(bf.getBean("store1"))).isTrue(); resolved = new ArrayList<>(); for (NumberStore instance : floatStoreProvider) { resolved.add(instance); } - assertThat(resolved.size()).isEqualTo(1); + assertThat(resolved).hasSize(1); assertThat(resolved.contains(bf.getBean("store2"))).isTrue(); resolved = floatStoreProvider.stream().collect(Collectors.toList()); - assertThat(resolved.size()).isEqualTo(1); + assertThat(resolved).hasSize(1); assertThat(resolved.contains(bf.getBean("store2"))).isTrue(); resolved = floatStoreProvider.orderedStream().collect(Collectors.toList()); - assertThat(resolved.size()).isEqualTo(1); + assertThat(resolved).hasSize(1); assertThat(resolved.contains(bf.getBean("store2"))).isTrue(); } @@ -939,7 +939,7 @@ class BeanFactoryGenericsTests { ObjectProvider> numberStoreProvider = bf.getBeanProvider(ResolvableType.forClass(NumberStore.class)); List> resolved = numberStoreProvider.orderedStream().toList(); - assertThat(resolved.size()).isEqualTo(2); + assertThat(resolved).hasSize(2); assertThat(resolved.get(0)).isSameAs(bf.getBean("store2")); assertThat(resolved.get(1)).isSameAs(bf.getBean("store1")); } @@ -963,9 +963,9 @@ class BeanFactoryGenericsTests { public static class CollectionDependentBean { public CollectionDependentBean(NamedUrlList list, NamedUrlSet set, NamedUrlMap map) { - assertThat(list.size()).isEqualTo(1); - assertThat(set.size()).isEqualTo(1); - assertThat(map.size()).isEqualTo(1); + assertThat(list).hasSize(1); + assertThat(set).hasSize(1); + assertThat(map).hasSize(1); } } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java index 04b82ca200a..e537f6f25cc 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java @@ -65,7 +65,7 @@ public class CollectionMergingTests { TestBean bean = (TestBean) this.beanFactory.getBean("childWithListOfRefs"); List list = bean.getSomeList(); assertThat(list).isNotNull(); - assertThat(list.size()).isEqualTo(3); + assertThat(list).hasSize(3); assertThat(list.get(2)).isNotNull(); boolean condition = list.get(2) instanceof TestBean; assertThat(condition).isTrue(); @@ -85,7 +85,7 @@ public class CollectionMergingTests { TestBean bean = (TestBean) this.beanFactory.getBean("childWithSetOfRefs"); Set set = bean.getSomeSet(); assertThat(set).isNotNull(); - assertThat(set.size()).isEqualTo(2); + assertThat(set).hasSize(2); Iterator it = set.iterator(); it.next(); Object o = it.next(); @@ -110,7 +110,7 @@ public class CollectionMergingTests { TestBean bean = (TestBean) this.beanFactory.getBean("childWithMapOfRefs"); Map map = bean.getSomeMap(); assertThat(map).isNotNull(); - assertThat(map.size()).isEqualTo(2); + assertThat(map).hasSize(2); assertThat(map.get("Rob")).isNotNull(); boolean condition = map.get("Rob") instanceof TestBean; assertThat(condition).isTrue(); @@ -142,7 +142,7 @@ public class CollectionMergingTests { TestBean bean = (TestBean) this.beanFactory.getBean("childWithListOfRefsInConstructor"); List list = bean.getSomeList(); assertThat(list).isNotNull(); - assertThat(list.size()).isEqualTo(3); + assertThat(list).hasSize(3); assertThat(list.get(2)).isNotNull(); boolean condition = list.get(2) instanceof TestBean; assertThat(condition).isTrue(); @@ -162,7 +162,7 @@ public class CollectionMergingTests { TestBean bean = (TestBean) this.beanFactory.getBean("childWithSetOfRefsInConstructor"); Set set = bean.getSomeSet(); assertThat(set).isNotNull(); - assertThat(set.size()).isEqualTo(2); + assertThat(set).hasSize(2); Iterator it = set.iterator(); it.next(); Object o = it.next(); @@ -187,7 +187,7 @@ public class CollectionMergingTests { TestBean bean = (TestBean) this.beanFactory.getBean("childWithMapOfRefsInConstructor"); Map map = bean.getSomeMap(); assertThat(map).isNotNull(); - assertThat(map.size()).isEqualTo(2); + assertThat(map).hasSize(2); assertThat(map.get("Rob")).isNotNull(); boolean condition = map.get("Rob") instanceof TestBean; assertThat(condition).isTrue(); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java index 29e2561fc75..d55ea9ffd96 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,6 +27,7 @@ import org.springframework.beans.factory.config.TypedStringValue; import org.springframework.beans.factory.parsing.AliasDefinition; import org.springframework.beans.factory.parsing.BeanComponentDefinition; import org.springframework.beans.factory.parsing.ComponentDefinition; +import org.springframework.beans.factory.parsing.DefaultsDefinition; import org.springframework.beans.factory.parsing.ImportDefinition; import org.springframework.beans.factory.parsing.PassThroughSourceExtractor; import org.springframework.beans.factory.support.DefaultListableBeanFactory; @@ -40,7 +41,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Juergen Hoeller */ @SuppressWarnings("rawtypes") -public class EventPublicationTests { +class EventPublicationTests { private final DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); @@ -49,7 +50,7 @@ public class EventPublicationTests { @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(this.beanFactory); reader.setEventListener(this.eventListener); reader.setSourceExtractor(new PassThroughSourceExtractor()); @@ -57,27 +58,23 @@ public class EventPublicationTests { } @Test - public void defaultsEventReceived() throws Exception { - List defaultsList = this.eventListener.getDefaults(); - boolean condition2 = !defaultsList.isEmpty(); - assertThat(condition2).isTrue(); - boolean condition1 = defaultsList.get(0) instanceof DocumentDefaultsDefinition; - assertThat(condition1).isTrue(); + void defaultsEventReceived() throws Exception { + List defaultsList = this.eventListener.getDefaults(); + assertThat(defaultsList).isNotEmpty(); + assertThat(defaultsList.get(0)).isInstanceOf(DocumentDefaultsDefinition.class); DocumentDefaultsDefinition defaults = (DocumentDefaultsDefinition) defaultsList.get(0); assertThat(defaults.getLazyInit()).isEqualTo("true"); assertThat(defaults.getAutowire()).isEqualTo("constructor"); assertThat(defaults.getInitMethod()).isEqualTo("myInit"); assertThat(defaults.getDestroyMethod()).isEqualTo("myDestroy"); assertThat(defaults.getMerge()).isEqualTo("true"); - boolean condition = defaults.getSource() instanceof Element; - assertThat(condition).isTrue(); + assertThat(defaults.getSource()).isInstanceOf(Element.class); } @Test - public void beanEventReceived() throws Exception { + void beanEventReceived() throws Exception { ComponentDefinition componentDefinition1 = this.eventListener.getComponentDefinition("testBean"); - boolean condition3 = componentDefinition1 instanceof BeanComponentDefinition; - assertThat(condition3).isTrue(); + assertThat(componentDefinition1).isInstanceOf(BeanComponentDefinition.class); assertThat(componentDefinition1.getBeanDefinitions().length).isEqualTo(1); BeanDefinition beanDefinition1 = componentDefinition1.getBeanDefinitions()[0]; assertThat(beanDefinition1.getConstructorArgumentValues().getGenericArgumentValue(String.class).getValue()).isEqualTo(new TypedStringValue("Rob Harrop")); @@ -86,12 +83,10 @@ public class EventPublicationTests { assertThat(componentDefinition1.getInnerBeanDefinitions().length).isEqualTo(1); BeanDefinition innerBd1 = componentDefinition1.getInnerBeanDefinitions()[0]; assertThat(innerBd1.getConstructorArgumentValues().getGenericArgumentValue(String.class).getValue()).isEqualTo(new TypedStringValue("ACME")); - boolean condition2 = componentDefinition1.getSource() instanceof Element; - assertThat(condition2).isTrue(); + assertThat(componentDefinition1.getSource()).isInstanceOf(Element.class); ComponentDefinition componentDefinition2 = this.eventListener.getComponentDefinition("testBean2"); - boolean condition1 = componentDefinition2 instanceof BeanComponentDefinition; - assertThat(condition1).isTrue(); + assertThat(componentDefinition2).isInstanceOf(BeanComponentDefinition.class); assertThat(componentDefinition1.getBeanDefinitions().length).isEqualTo(1); BeanDefinition beanDefinition2 = componentDefinition2.getBeanDefinitions()[0]; assertThat(beanDefinition2.getPropertyValues().getPropertyValue("name").getValue()).isEqualTo(new TypedStringValue("Juergen Hoeller")); @@ -99,32 +94,28 @@ public class EventPublicationTests { assertThat(componentDefinition2.getInnerBeanDefinitions().length).isEqualTo(1); BeanDefinition innerBd2 = componentDefinition2.getInnerBeanDefinitions()[0]; assertThat(innerBd2.getPropertyValues().getPropertyValue("name").getValue()).isEqualTo(new TypedStringValue("Eva Schallmeiner")); - boolean condition = componentDefinition2.getSource() instanceof Element; - assertThat(condition).isTrue(); + assertThat(componentDefinition2.getSource()).isInstanceOf(Element.class); } @Test - public void aliasEventReceived() throws Exception { - List aliases = this.eventListener.getAliases("testBean"); - assertThat(aliases.size()).isEqualTo(2); - AliasDefinition aliasDefinition1 = (AliasDefinition) aliases.get(0); + void aliasEventReceived() throws Exception { + List aliases = this.eventListener.getAliases("testBean"); + assertThat(aliases).hasSize(2); + AliasDefinition aliasDefinition1 = aliases.get(0); assertThat(aliasDefinition1.getAlias()).isEqualTo("testBeanAlias1"); - boolean condition1 = aliasDefinition1.getSource() instanceof Element; - assertThat(condition1).isTrue(); - AliasDefinition aliasDefinition2 = (AliasDefinition) aliases.get(1); + assertThat(aliasDefinition1.getSource()).isInstanceOf(Element.class); + AliasDefinition aliasDefinition2 = aliases.get(1); assertThat(aliasDefinition2.getAlias()).isEqualTo("testBeanAlias2"); - boolean condition = aliasDefinition2.getSource() instanceof Element; - assertThat(condition).isTrue(); + assertThat(aliasDefinition2.getSource()).isInstanceOf(Element.class); } @Test - public void importEventReceived() throws Exception { - List imports = this.eventListener.getImports(); - assertThat(imports.size()).isEqualTo(1); - ImportDefinition importDefinition = (ImportDefinition) imports.get(0); + void importEventReceived() throws Exception { + List imports = this.eventListener.getImports(); + assertThat(imports).hasSize(1); + ImportDefinition importDefinition = imports.get(0); assertThat(importDefinition.getImportedResource()).isEqualTo("beanEventsImported.xml"); - boolean condition = importDefinition.getSource() instanceof Element; - assertThat(condition).isTrue(); + assertThat(importDefinition.getSource()).isInstanceOf(Element.class); } } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java index 083d6f9de35..b8ff82b1093 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java @@ -54,7 +54,7 @@ public class UtilNamespaceHandlerTests { @BeforeEach - public void setUp() { + void setUp() { this.beanFactory = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(this.beanFactory); reader.setEventListener(this.listener); @@ -63,19 +63,19 @@ public class UtilNamespaceHandlerTests { @Test - public void testConstant() { + void testConstant() { Integer min = (Integer) this.beanFactory.getBean("min"); assertThat(min.intValue()).isEqualTo(Integer.MIN_VALUE); } @Test - public void testConstantWithDefaultName() { + void testConstantWithDefaultName() { Integer max = (Integer) this.beanFactory.getBean("java.lang.Integer.MAX_VALUE"); assertThat(max.intValue()).isEqualTo(Integer.MAX_VALUE); } @Test - public void testEvents() { + void testEvents() { ComponentDefinition propertiesComponent = this.listener.getComponentDefinition("myProperties"); assertThat(propertiesComponent).as("Event for 'myProperties' not sent").isNotNull(); AbstractBeanDefinition propertiesBean = (AbstractBeanDefinition) propertiesComponent.getBeanDefinitions()[0]; @@ -88,109 +88,106 @@ public class UtilNamespaceHandlerTests { } @Test - public void testNestedProperties() { + void testNestedProperties() { TestBean bean = (TestBean) this.beanFactory.getBean("testBean"); Properties props = bean.getSomeProperties(); assertThat(props.get("foo")).as("Incorrect property value").isEqualTo("bar"); } @Test - public void testPropertyPath() { + void testPropertyPath() { String name = (String) this.beanFactory.getBean("name"); assertThat(name).isEqualTo("Rob Harrop"); } @Test - public void testNestedPropertyPath() { + void testNestedPropertyPath() { TestBean bean = (TestBean) this.beanFactory.getBean("testBean"); assertThat(bean.getName()).isEqualTo("Rob Harrop"); } @Test - public void testSimpleMap() { - Map map = (Map) this.beanFactory.getBean("simpleMap"); + void testSimpleMap() { + Map map = (Map) this.beanFactory.getBean("simpleMap"); assertThat(map.get("foo")).isEqualTo("bar"); - Map map2 = (Map) this.beanFactory.getBean("simpleMap"); + Map map2 = (Map) this.beanFactory.getBean("simpleMap"); assertThat(map == map2).isTrue(); } @Test - public void testScopedMap() { - Map map = (Map) this.beanFactory.getBean("scopedMap"); + void testScopedMap() { + Map map = (Map) this.beanFactory.getBean("scopedMap"); assertThat(map.get("foo")).isEqualTo("bar"); - Map map2 = (Map) this.beanFactory.getBean("scopedMap"); + Map map2 = (Map) this.beanFactory.getBean("scopedMap"); assertThat(map2.get("foo")).isEqualTo("bar"); assertThat(map != map2).isTrue(); } @Test - public void testSimpleList() { - List list = (List) this.beanFactory.getBean("simpleList"); + void testSimpleList() { + List list = (List) this.beanFactory.getBean("simpleList"); assertThat(list.get(0)).isEqualTo("Rob Harrop"); - List list2 = (List) this.beanFactory.getBean("simpleList"); + List list2 = (List) this.beanFactory.getBean("simpleList"); assertThat(list == list2).isTrue(); } @Test - public void testScopedList() { - List list = (List) this.beanFactory.getBean("scopedList"); + void testScopedList() { + List list = (List) this.beanFactory.getBean("scopedList"); assertThat(list.get(0)).isEqualTo("Rob Harrop"); - List list2 = (List) this.beanFactory.getBean("scopedList"); + List list2 = (List) this.beanFactory.getBean("scopedList"); assertThat(list2.get(0)).isEqualTo("Rob Harrop"); assertThat(list != list2).isTrue(); } @Test - public void testSimpleSet() { - Set set = (Set) this.beanFactory.getBean("simpleSet"); + void testSimpleSet() { + Set set = (Set) this.beanFactory.getBean("simpleSet"); assertThat(set.contains("Rob Harrop")).isTrue(); - Set set2 = (Set) this.beanFactory.getBean("simpleSet"); + Set set2 = (Set) this.beanFactory.getBean("simpleSet"); assertThat(set == set2).isTrue(); } @Test - public void testScopedSet() { - Set set = (Set) this.beanFactory.getBean("scopedSet"); + void testScopedSet() { + Set set = (Set) this.beanFactory.getBean("scopedSet"); assertThat(set.contains("Rob Harrop")).isTrue(); - Set set2 = (Set) this.beanFactory.getBean("scopedSet"); + Set set2 = (Set) this.beanFactory.getBean("scopedSet"); assertThat(set2.contains("Rob Harrop")).isTrue(); assertThat(set != set2).isTrue(); } @Test - public void testMapWithRef() { - Map map = (Map) this.beanFactory.getBean("mapWithRef"); - boolean condition = map instanceof TreeMap; - assertThat(condition).isTrue(); + void testMapWithRef() { + Map map = (Map) this.beanFactory.getBean("mapWithRef"); + assertThat(map).isInstanceOf(TreeMap.class); assertThat(map.get("bean")).isEqualTo(this.beanFactory.getBean("testBean")); } @Test - public void testMapWithTypes() { - Map map = (Map) this.beanFactory.getBean("mapWithTypes"); - boolean condition = map instanceof LinkedCaseInsensitiveMap; - assertThat(condition).isTrue(); + void testMapWithTypes() { + Map map = (Map) this.beanFactory.getBean("mapWithTypes"); + assertThat(map).isInstanceOf(LinkedCaseInsensitiveMap.class); assertThat(map.get("bean")).isEqualTo(this.beanFactory.getBean("testBean")); } @Test - public void testNestedCollections() { + void testNestedCollections() { TestBean bean = (TestBean) this.beanFactory.getBean("nestedCollectionsBean"); - List list = bean.getSomeList(); - assertThat(list.size()).isEqualTo(1); + List list = bean.getSomeList(); + assertThat(list).hasSize(1); assertThat(list.get(0)).isEqualTo("foo"); - Set set = bean.getSomeSet(); - assertThat(set.size()).isEqualTo(1); + Set set = bean.getSomeSet(); + assertThat(set).hasSize(1); assertThat(set.contains("bar")).isTrue(); - Map map = bean.getSomeMap(); - assertThat(map.size()).isEqualTo(1); - boolean condition = map.get("foo") instanceof Set; - assertThat(condition).isTrue(); - Set innerSet = (Set) map.get("foo"); - assertThat(innerSet.size()).isEqualTo(1); + Map map = bean.getSomeMap(); + assertThat(map).hasSize(1); + assertThat(map.get("foo")).isInstanceOf(Set.class); + Set innerSet = (Set) map.get("foo"); + assertThat(innerSet).hasSize(1); assertThat(innerSet.contains("bar")).isTrue(); TestBean bean2 = (TestBean) this.beanFactory.getBean("nestedCollectionsBean"); @@ -203,18 +200,18 @@ public class UtilNamespaceHandlerTests { } @Test - public void testNestedShortcutCollections() { + void testNestedShortcutCollections() { TestBean bean = (TestBean) this.beanFactory.getBean("nestedShortcutCollections"); assertThat(bean.getStringArray().length).isEqualTo(1); assertThat(bean.getStringArray()[0]).isEqualTo("fooStr"); - List list = bean.getSomeList(); - assertThat(list.size()).isEqualTo(1); + List list = bean.getSomeList(); + assertThat(list).hasSize(1); assertThat(list.get(0)).isEqualTo("foo"); - Set set = bean.getSomeSet(); - assertThat(set.size()).isEqualTo(1); + Set set = bean.getSomeSet(); + assertThat(set).hasSize(1); assertThat(set.contains("bar")).isTrue(); TestBean bean2 = (TestBean) this.beanFactory.getBean("nestedShortcutCollections"); @@ -227,20 +224,20 @@ public class UtilNamespaceHandlerTests { } @Test - public void testNestedInCollections() { + void testNestedInCollections() { TestBean bean = (TestBean) this.beanFactory.getBean("nestedCustomTagBean"); - List list = bean.getSomeList(); - assertThat(list.size()).isEqualTo(1); + List list = bean.getSomeList(); + assertThat(list).hasSize(1); assertThat(list.get(0)).isEqualTo(Integer.MIN_VALUE); - Set set = bean.getSomeSet(); - assertThat(set.size()).isEqualTo(2); + Set set = bean.getSomeSet(); + assertThat(set).hasSize(2); assertThat(set.contains(Thread.State.NEW)).isTrue(); assertThat(set.contains(Thread.State.RUNNABLE)).isTrue(); - Map map = bean.getSomeMap(); - assertThat(map.size()).isEqualTo(1); + Map map = bean.getSomeMap(); + assertThat(map).hasSize(1); assertThat(map.get("min")).isEqualTo(CustomEnum.VALUE_1); TestBean bean2 = (TestBean) this.beanFactory.getBean("nestedCustomTagBean"); @@ -253,93 +250,93 @@ public class UtilNamespaceHandlerTests { } @Test - public void testCircularCollections() { + void testCircularCollections() { TestBean bean = (TestBean) this.beanFactory.getBean("circularCollectionsBean"); - List list = bean.getSomeList(); - assertThat(list.size()).isEqualTo(1); + List list = bean.getSomeList(); + assertThat(list).hasSize(1); assertThat(list.get(0)).isEqualTo(bean); - Set set = bean.getSomeSet(); - assertThat(set.size()).isEqualTo(1); + Set set = bean.getSomeSet(); + assertThat(set).hasSize(1); assertThat(set.contains(bean)).isTrue(); - Map map = bean.getSomeMap(); - assertThat(map.size()).isEqualTo(1); + Map map = bean.getSomeMap(); + assertThat(map).hasSize(1); assertThat(map.get("foo")).isEqualTo(bean); } @Test - public void testCircularCollectionBeansStartingWithList() { + void testCircularCollectionBeansStartingWithList() { this.beanFactory.getBean("circularList"); TestBean bean = (TestBean) this.beanFactory.getBean("circularCollectionBeansBean"); - List list = bean.getSomeList(); + List list = bean.getSomeList(); assertThat(Proxy.isProxyClass(list.getClass())).isTrue(); - assertThat(list.size()).isEqualTo(1); + assertThat(list).hasSize(1); assertThat(list.get(0)).isEqualTo(bean); - Set set = bean.getSomeSet(); + Set set = bean.getSomeSet(); assertThat(Proxy.isProxyClass(set.getClass())).isFalse(); - assertThat(set.size()).isEqualTo(1); + assertThat(set).hasSize(1); assertThat(set.contains(bean)).isTrue(); - Map map = bean.getSomeMap(); + Map map = bean.getSomeMap(); assertThat(Proxy.isProxyClass(map.getClass())).isFalse(); - assertThat(map.size()).isEqualTo(1); + assertThat(map).hasSize(1); assertThat(map.get("foo")).isEqualTo(bean); } @Test - public void testCircularCollectionBeansStartingWithSet() { + void testCircularCollectionBeansStartingWithSet() { this.beanFactory.getBean("circularSet"); TestBean bean = (TestBean) this.beanFactory.getBean("circularCollectionBeansBean"); - List list = bean.getSomeList(); + List list = bean.getSomeList(); assertThat(Proxy.isProxyClass(list.getClass())).isFalse(); - assertThat(list.size()).isEqualTo(1); + assertThat(list).hasSize(1); assertThat(list.get(0)).isEqualTo(bean); - Set set = bean.getSomeSet(); + Set set = bean.getSomeSet(); assertThat(Proxy.isProxyClass(set.getClass())).isTrue(); - assertThat(set.size()).isEqualTo(1); + assertThat(set).hasSize(1); assertThat(set.contains(bean)).isTrue(); - Map map = bean.getSomeMap(); + Map map = bean.getSomeMap(); assertThat(Proxy.isProxyClass(map.getClass())).isFalse(); - assertThat(map.size()).isEqualTo(1); + assertThat(map).hasSize(1); assertThat(map.get("foo")).isEqualTo(bean); } @Test - public void testCircularCollectionBeansStartingWithMap() { + void testCircularCollectionBeansStartingWithMap() { this.beanFactory.getBean("circularMap"); TestBean bean = (TestBean) this.beanFactory.getBean("circularCollectionBeansBean"); - List list = bean.getSomeList(); + List list = bean.getSomeList(); assertThat(Proxy.isProxyClass(list.getClass())).isFalse(); - assertThat(list.size()).isEqualTo(1); + assertThat(list).hasSize(1); assertThat(list.get(0)).isEqualTo(bean); - Set set = bean.getSomeSet(); + Set set = bean.getSomeSet(); assertThat(Proxy.isProxyClass(set.getClass())).isFalse(); - assertThat(set.size()).isEqualTo(1); + assertThat(set).hasSize(1); assertThat(set.contains(bean)).isTrue(); - Map map = bean.getSomeMap(); + Map map = bean.getSomeMap(); assertThat(Proxy.isProxyClass(map.getClass())).isTrue(); - assertThat(map.size()).isEqualTo(1); + assertThat(map).hasSize(1); assertThat(map.get("foo")).isEqualTo(bean); } @Test - public void testNestedInConstructor() { + void testNestedInConstructor() { TestBean bean = (TestBean) this.beanFactory.getBean("constructedTestBean"); assertThat(bean.getName()).isEqualTo("Rob Harrop"); } @Test - public void testLoadProperties() { + void testLoadProperties() { Properties props = (Properties) this.beanFactory.getBean("myProperties"); assertThat(props.get("foo")).as("Incorrect property value").isEqualTo("bar"); assertThat(props.get("foo2")).as("Incorrect property value").isNull(); @@ -348,7 +345,7 @@ public class UtilNamespaceHandlerTests { } @Test - public void testScopedProperties() { + void testScopedProperties() { Properties props = (Properties) this.beanFactory.getBean("myScopedProperties"); assertThat(props.get("foo")).as("Incorrect property value").isEqualTo("bar"); assertThat(props.get("foo2")).as("Incorrect property value").isNull(); @@ -359,35 +356,35 @@ public class UtilNamespaceHandlerTests { } @Test - public void testLocalProperties() { + void testLocalProperties() { Properties props = (Properties) this.beanFactory.getBean("myLocalProperties"); assertThat(props.get("foo")).as("Incorrect property value").isNull(); assertThat(props.get("foo2")).as("Incorrect property value").isEqualTo("bar2"); } @Test - public void testMergedProperties() { + void testMergedProperties() { Properties props = (Properties) this.beanFactory.getBean("myMergedProperties"); assertThat(props.get("foo")).as("Incorrect property value").isEqualTo("bar"); assertThat(props.get("foo2")).as("Incorrect property value").isEqualTo("bar2"); } @Test - public void testLocalOverrideDefault() { + void testLocalOverrideDefault() { Properties props = (Properties) this.beanFactory.getBean("defaultLocalOverrideProperties"); assertThat(props.get("foo")).as("Incorrect property value").isEqualTo("bar"); assertThat(props.get("foo2")).as("Incorrect property value").isEqualTo("local2"); } @Test - public void testLocalOverrideFalse() { + void testLocalOverrideFalse() { Properties props = (Properties) this.beanFactory.getBean("falseLocalOverrideProperties"); assertThat(props.get("foo")).as("Incorrect property value").isEqualTo("bar"); assertThat(props.get("foo2")).as("Incorrect property value").isEqualTo("local2"); } @Test - public void testLocalOverrideTrue() { + void testLocalOverrideTrue() { Properties props = (Properties) this.beanFactory.getBean("trueLocalOverrideProperties"); assertThat(props.get("foo")).as("Incorrect property value").isEqualTo("local"); assertThat(props.get("foo2")).as("Incorrect property value").isEqualTo("local2"); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java index 29564a9f7b0..e67aa1d9729 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java @@ -356,12 +356,12 @@ public class XmlBeanCollectionTests { @Test public void testProps() throws Exception { HasMap hasMap = (HasMap) this.beanFactory.getBean("props"); - assertThat(hasMap.getProps().size()).isEqualTo(2); + assertThat(hasMap.getProps()).hasSize(2); assertThat(hasMap.getProps().getProperty("foo")).isEqualTo("bar"); assertThat(hasMap.getProps().getProperty("2")).isEqualTo("TWO"); HasMap hasMap2 = (HasMap) this.beanFactory.getBean("propsViaMap"); - assertThat(hasMap2.getProps().size()).isEqualTo(2); + assertThat(hasMap2.getProps()).hasSize(2); assertThat(hasMap2.getProps().getProperty("foo")).isEqualTo("bar"); assertThat(hasMap2.getProps().getProperty("2")).isEqualTo("TWO"); } @@ -432,7 +432,7 @@ public class XmlBeanCollectionTests { boolean condition = sam.getObject() instanceof Map; assertThat(condition).as("Didn't choose constructor with Map argument").isTrue(); Map map = (Map) sam.getObject(); - assertThat(map.size()).isEqualTo(3); + assertThat(map).hasSize(3); assertThat(map.get("key1")).isEqualTo("val1"); assertThat(map.get("key2")).isEqualTo("val2"); assertThat(map.get("key3")).isEqualTo("val3"); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java index 4b5c005788d..791340e2ec3 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java @@ -138,7 +138,7 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest TestBean alias1 = (TestBean) getBeanFactory().getBean("myalias"); assertThat(tb1 == alias1).isTrue(); List tb1Aliases = Arrays.asList(getBeanFactory().getAliases("aliased")); - assertThat(tb1Aliases.size()).isEqualTo(2); + assertThat(tb1Aliases).hasSize(2); assertThat(tb1Aliases.contains("myalias")).isTrue(); assertThat(tb1Aliases.contains("youralias")).isTrue(); assertThat(beanNames.contains("aliased")).isTrue(); @@ -156,7 +156,7 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest assertThat(tb2 == alias3b).isTrue(); List tb2Aliases = Arrays.asList(getBeanFactory().getAliases("multiAliased")); - assertThat(tb2Aliases.size()).isEqualTo(4); + assertThat(tb2Aliases).hasSize(4); assertThat(tb2Aliases.contains("alias1")).isTrue(); assertThat(tb2Aliases.contains("alias2")).isTrue(); assertThat(tb2Aliases.contains("alias3")).isTrue(); @@ -173,7 +173,7 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest assertThat(tb3 == alias4).isTrue(); assertThat(tb3 == alias5).isTrue(); List tb3Aliases = Arrays.asList(getBeanFactory().getAliases("aliasWithoutId1")); - assertThat(tb3Aliases.size()).isEqualTo(2); + assertThat(tb3Aliases).hasSize(2); assertThat(tb3Aliases.contains("aliasWithoutId2")).isTrue(); assertThat(tb3Aliases.contains("aliasWithoutId3")).isTrue(); assertThat(beanNames.contains("aliasWithoutId1")).isTrue(); @@ -184,7 +184,7 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest assertThat(tb4.getName()).isNull(); Map drs = getListableBeanFactory().getBeansOfType(DummyReferencer.class, false, false); - assertThat(drs.size()).isEqualTo(5); + assertThat(drs).hasSize(5); assertThat(drs.containsKey(DummyReferencer.class.getName() + "#0")).isTrue(); assertThat(drs.containsKey(DummyReferencer.class.getName() + "#1")).isTrue(); assertThat(drs.containsKey(DummyReferencer.class.getName() + "#2")).isTrue(); diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java index aa3b733412f..baa9dfd893b 100644 --- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java @@ -1357,12 +1357,12 @@ class CustomEditorTests { bw.registerCustomEditor(Hashtable.class, new CustomMapEditor(Hashtable.class)); bw.setPropertyValue("vector", new String[] {"a", "b"}); - assertThat(tb.getVector().size()).isEqualTo(2); + assertThat(tb.getVector()).hasSize(2); assertThat(tb.getVector().get(0)).isEqualTo("a"); assertThat(tb.getVector().get(1)).isEqualTo("b"); bw.setPropertyValue("hashtable", Collections.singletonMap("foo", "bar")); - assertThat(tb.getHashtable().size()).isEqualTo(1); + assertThat(tb.getHashtable()).hasSize(1); assertThat(tb.getHashtable().get("foo")).isEqualTo("bar"); } diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/PropertiesEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/PropertiesEditorTests.java index 32fb123680b..bad7108e4aa 100644 --- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/PropertiesEditorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/PropertiesEditorTests.java @@ -139,7 +139,7 @@ public class PropertiesEditorTests { PropertiesEditor pe= new PropertiesEditor(); pe.setAsText(null); Properties p = (Properties) pe.getValue(); - assertThat(p.size()).isEqualTo(0); + assertThat(p).hasSize(0); } @Test @@ -163,7 +163,7 @@ public class PropertiesEditorTests { boolean condition = value instanceof Properties; assertThat(condition).isTrue(); Properties props = (Properties) value; - assertThat(props.size()).isEqualTo(3); + assertThat(props).hasSize(3); assertThat(props.getProperty("one")).isEqualTo("1"); assertThat(props.getProperty("two")).isEqualTo("2"); assertThat(props.getProperty("three")).isEqualTo("3"); diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/CacheResolverAdapterTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/CacheResolverAdapterTests.java index 1b1e91495b7..3e685e848cf 100644 --- a/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/CacheResolverAdapterTests.java +++ b/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/CacheResolverAdapterTests.java @@ -46,7 +46,7 @@ public class CacheResolverAdapterTests extends AbstractJCacheTests { CacheResolverAdapter adapter = new CacheResolverAdapter(getCacheResolver(dummyContext, "testCache")); Collection caches = adapter.resolveCaches(dummyContext); assertThat(caches).isNotNull(); - assertThat(caches.size()).isEqualTo(1); + assertThat(caches).hasSize(1); assertThat(caches.iterator().next().getName()).isEqualTo("testCache"); } diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/CacheResultOperationTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/CacheResultOperationTests.java index aff8f3ebe61..d0cea7ba3e7 100644 --- a/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/CacheResultOperationTests.java +++ b/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/CacheResultOperationTests.java @@ -107,11 +107,11 @@ public class CacheResultOperationTests extends AbstractCacheOperationTests firstParameterAnnotations = parameters[0].getAnnotations(); - assertThat(firstParameterAnnotations.size()).isEqualTo(1); + assertThat(firstParameterAnnotations).hasSize(1); assertThat(firstParameterAnnotations.iterator().next().annotationType()).isEqualTo(CacheKey.class); Set secondParameterAnnotations = parameters[1].getAnnotations(); - assertThat(secondParameterAnnotations.size()).isEqualTo(1); + assertThat(secondParameterAnnotations).hasSize(1); assertThat(secondParameterAnnotations.iterator().next().annotationType()).isEqualTo(Value.class); } diff --git a/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java b/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java index 503044c9783..c22c0befd82 100644 --- a/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java +++ b/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java @@ -79,22 +79,22 @@ public class JavaMailSenderTests { assertThat(sender.transport.getConnectedPassword()).isEqualTo("password"); assertThat(sender.transport.isCloseCalled()).isTrue(); - assertThat(sender.transport.getSentMessages().size()).isEqualTo(1); + assertThat(sender.transport.getSentMessages()).hasSize(1); MimeMessage sentMessage = sender.transport.getSentMessage(0); List
froms = Arrays.asList(sentMessage.getFrom()); - assertThat(froms.size()).isEqualTo(1); + assertThat(froms).hasSize(1); assertThat(((InternetAddress) froms.get(0)).getAddress()).isEqualTo("me@mail.org"); List
replyTos = Arrays.asList(sentMessage.getReplyTo()); assertThat(((InternetAddress) replyTos.get(0)).getAddress()).isEqualTo("reply@mail.org"); List
tos = Arrays.asList(sentMessage.getRecipients(Message.RecipientType.TO)); - assertThat(tos.size()).isEqualTo(1); + assertThat(tos).hasSize(1); assertThat(((InternetAddress) tos.get(0)).getAddress()).isEqualTo("you@mail.org"); List
ccs = Arrays.asList(sentMessage.getRecipients(Message.RecipientType.CC)); - assertThat(ccs.size()).isEqualTo(2); + assertThat(ccs).hasSize(2); assertThat(((InternetAddress) ccs.get(0)).getAddress()).isEqualTo("he@mail.org"); assertThat(((InternetAddress) ccs.get(1)).getAddress()).isEqualTo("she@mail.org"); List
bccs = Arrays.asList(sentMessage.getRecipients(Message.RecipientType.BCC)); - assertThat(bccs.size()).isEqualTo(2); + assertThat(bccs).hasSize(2); assertThat(((InternetAddress) bccs.get(0)).getAddress()).isEqualTo("us@mail.org"); assertThat(((InternetAddress) bccs.get(1)).getAddress()).isEqualTo("them@mail.org"); assertThat(sentMessage.getSentDate().getTime()).isEqualTo(sentDate.getTime()); @@ -120,14 +120,14 @@ public class JavaMailSenderTests { assertThat(sender.transport.getConnectedPassword()).isEqualTo("password"); assertThat(sender.transport.isCloseCalled()).isTrue(); - assertThat(sender.transport.getSentMessages().size()).isEqualTo(2); + assertThat(sender.transport.getSentMessages()).hasSize(2); MimeMessage sentMessage1 = sender.transport.getSentMessage(0); List
tos1 = Arrays.asList(sentMessage1.getRecipients(Message.RecipientType.TO)); - assertThat(tos1.size()).isEqualTo(1); + assertThat(tos1).hasSize(1); assertThat(((InternetAddress) tos1.get(0)).getAddress()).isEqualTo("he@mail.org"); MimeMessage sentMessage2 = sender.transport.getSentMessage(1); List
tos2 = Arrays.asList(sentMessage2.getRecipients(Message.RecipientType.TO)); - assertThat(tos2.size()).isEqualTo(1); + assertThat(tos2).hasSize(1); assertThat(((InternetAddress) tos2.get(0)).getAddress()).isEqualTo("she@mail.org"); } @@ -146,7 +146,7 @@ public class JavaMailSenderTests { assertThat(sender.transport.getConnectedUsername()).isEqualTo("username"); assertThat(sender.transport.getConnectedPassword()).isEqualTo("password"); assertThat(sender.transport.isCloseCalled()).isTrue(); - assertThat(sender.transport.getSentMessages().size()).isEqualTo(1); + assertThat(sender.transport.getSentMessages()).hasSize(1); assertThat(sender.transport.getSentMessage(0)).isEqualTo(mimeMessage); } @@ -167,7 +167,7 @@ public class JavaMailSenderTests { assertThat(sender.transport.getConnectedUsername()).isEqualTo("username"); assertThat(sender.transport.getConnectedPassword()).isEqualTo("password"); assertThat(sender.transport.isCloseCalled()).isTrue(); - assertThat(sender.transport.getSentMessages().size()).isEqualTo(2); + assertThat(sender.transport.getSentMessages()).hasSize(2); assertThat(sender.transport.getSentMessage(0)).isEqualTo(mimeMessage1); assertThat(sender.transport.getSentMessage(1)).isEqualTo(mimeMessage2); } @@ -191,7 +191,7 @@ public class JavaMailSenderTests { assertThat(sender.transport.getConnectedUsername()).isEqualTo("username"); assertThat(sender.transport.getConnectedPassword()).isEqualTo("password"); assertThat(sender.transport.isCloseCalled()).isTrue(); - assertThat(sender.transport.getSentMessages().size()).isEqualTo(1); + assertThat(sender.transport.getSentMessages()).hasSize(1); assertThat(sender.transport.getSentMessage(0)).isEqualTo(messages.get(0)); } @@ -218,7 +218,7 @@ public class JavaMailSenderTests { assertThat(sender.transport.getConnectedUsername()).isEqualTo("username"); assertThat(sender.transport.getConnectedPassword()).isEqualTo("password"); assertThat(sender.transport.isCloseCalled()).isTrue(); - assertThat(sender.transport.getSentMessages().size()).isEqualTo(2); + assertThat(sender.transport.getSentMessages()).hasSize(2); assertThat(sender.transport.getSentMessage(0)).isEqualTo(messages.get(0)); assertThat(sender.transport.getSentMessage(1)).isEqualTo(messages.get(1)); } @@ -242,7 +242,7 @@ public class JavaMailSenderTests { assertThat(sender.transport.getConnectedUsername()).isEqualTo("username"); assertThat(sender.transport.getConnectedPassword()).isEqualTo("password"); assertThat(sender.transport.isCloseCalled()).isTrue(); - assertThat(sender.transport.getSentMessages().size()).isEqualTo(1); + assertThat(sender.transport.getSentMessages()).hasSize(1); assertThat(sender.transport.getSentMessage(0)).isEqualTo(message.getMimeMessage()); } @@ -266,7 +266,7 @@ public class JavaMailSenderTests { assertThat(sender.transport.getConnectedUsername()).isEqualTo("username"); assertThat(sender.transport.getConnectedPassword()).isEqualTo("password"); assertThat(sender.transport.isCloseCalled()).isTrue(); - assertThat(sender.transport.getSentMessages().size()).isEqualTo(1); + assertThat(sender.transport.getSentMessages()).hasSize(1); assertThat(sender.transport.getSentMessage(0)).isEqualTo(message.getMimeMessage()); } @@ -291,7 +291,7 @@ public class JavaMailSenderTests { assertThat(sender.transport.getConnectedUsername()).isEqualTo("username"); assertThat(sender.transport.getConnectedPassword()).isEqualTo("password"); assertThat(sender.transport.isCloseCalled()).isTrue(); - assertThat(sender.transport.getSentMessages().size()).isEqualTo(1); + assertThat(sender.transport.getSentMessages()).hasSize(1); assertThat(sender.transport.getSentMessage(0)).isEqualTo(message.getMimeMessage()); } @@ -349,7 +349,7 @@ public class JavaMailSenderTests { assertThat(sender.transport.getConnectedUsername()).isEqualTo("username"); assertThat(sender.transport.getConnectedPassword()).isEqualTo("password"); assertThat(sender.transport.isCloseCalled()).isTrue(); - assertThat(sender.transport.getSentMessages().size()).isEqualTo(1); + assertThat(sender.transport.getSentMessages()).hasSize(1); assertThat(sender.transport.getSentMessage(0)).isEqualTo(mimeMessage); } @@ -377,7 +377,7 @@ public class JavaMailSenderTests { assertThat(sender.transport.getConnectedUsername()).isEqualTo("username"); assertThat(sender.transport.getConnectedPassword()).isEqualTo("password"); assertThat(sender.transport.isCloseCalled()).isTrue(); - assertThat(sender.transport.getSentMessages().size()).isEqualTo(1); + assertThat(sender.transport.getSentMessages()).hasSize(1); assertThat(sender.transport.getSentMessage(0)).isEqualTo(mimeMessage); } @@ -427,9 +427,9 @@ public class JavaMailSenderTests { assertThat(sender.transport.getConnectedUsername()).isEqualTo("username"); assertThat(sender.transport.getConnectedPassword()).isEqualTo("password"); assertThat(sender.transport.isCloseCalled()).isTrue(); - assertThat(sender.transport.getSentMessages().size()).isEqualTo(1); + assertThat(sender.transport.getSentMessages()).hasSize(1); assertThat(sender.transport.getSentMessage(0).getAllRecipients()[0]).isEqualTo(new InternetAddress("she@mail.org")); - assertThat(ex.getFailedMessages().size()).isEqualTo(1); + assertThat(ex.getFailedMessages()).hasSize(1); assertThat(ex.getFailedMessages().keySet().iterator().next()).isEqualTo(simpleMessage1); Object subEx = ex.getFailedMessages().values().iterator().next(); boolean condition = subEx instanceof MessagingException; @@ -460,9 +460,9 @@ public class JavaMailSenderTests { assertThat(sender.transport.getConnectedUsername()).isEqualTo("username"); assertThat(sender.transport.getConnectedPassword()).isEqualTo("password"); assertThat(sender.transport.isCloseCalled()).isTrue(); - assertThat(sender.transport.getSentMessages().size()).isEqualTo(1); + assertThat(sender.transport.getSentMessages()).hasSize(1); assertThat(sender.transport.getSentMessage(0)).isEqualTo(mimeMessage2); - assertThat(ex.getFailedMessages().size()).isEqualTo(1); + assertThat(ex.getFailedMessages()).hasSize(1); assertThat(ex.getFailedMessages().keySet().iterator().next()).isEqualTo(mimeMessage1); Object subEx = ex.getFailedMessages().values().iterator().next(); boolean condition = subEx instanceof MessagingException; diff --git a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java index 46fe8fa1b57..f39caa162f2 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java @@ -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); } diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java index b165abefaee..cdcc455e121 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java @@ -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(); diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java index 7b03b3706fd..78f095f369e 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java @@ -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); } diff --git a/spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheTests.java b/spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheTests.java index 4e8a9d3fbca..663cd8b87c2 100644 --- a/spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheTests.java +++ b/spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheTests.java @@ -88,7 +88,7 @@ public class ConcurrentMapCacheTests extends AbstractValueAdaptingCacheTests entry = (List) serializeCache.get(key).get(); - assertThat(entry.size()).isEqualTo(3); + assertThat(entry).hasSize(3); assertThat(entry.get(0)).isEqualTo("one"); } diff --git a/spring-context/src/test/java/org/springframework/cache/interceptor/ExpressionEvaluatorTests.java b/spring-context/src/test/java/org/springframework/cache/interceptor/ExpressionEvaluatorTests.java index 495c977b9c6..5248f04534e 100644 --- a/spring-context/src/test/java/org/springframework/cache/interceptor/ExpressionEvaluatorTests.java +++ b/spring-context/src/test/java/org/springframework/cache/interceptor/ExpressionEvaluatorTests.java @@ -61,7 +61,7 @@ public class ExpressionEvaluatorTests { @Test public void testMultipleCachingSource() { Collection ops = getOps("multipleCaching"); - assertThat(ops.size()).isEqualTo(2); + assertThat(ops).hasSize(2); Iterator it = ops.iterator(); CacheOperation next = it.next(); assertThat(next instanceof CacheableOperation).isTrue(); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java index 99f604181d5..70932fa983e 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java @@ -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); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProviderTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProviderTests.java index 82bff2f0f10..db5bf84f3e8 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProviderTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProviderTests.java @@ -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 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 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 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 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 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 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 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 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 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 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 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 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(); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java index 3ab1e7d015a..3493ef605b5 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java @@ -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(); } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassWithConditionTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassWithConditionTests.java index e5593c5d873..768b11e460b 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassWithConditionTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassWithConditionTests.java @@ -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 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 beans = context.getBeansOfType(ExampleBean.class); - assertThat(beans.size()).isEqualTo(1); + assertThat(beans).hasSize(1); assertThat(beans.keySet().iterator().next()).isEqualTo("baz"); } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ImportSelectorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ImportSelectorTests.java index 1b9214753b6..89f69ad35f4 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ImportSelectorTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ImportSelectorTests.java @@ -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 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())) diff --git a/spring-context/src/test/java/org/springframework/context/conversionservice/ConversionServiceContextConfigTests.java b/spring-context/src/test/java/org/springframework/context/conversionservice/ConversionServiceContextConfigTests.java index c3b3629e2f9..a594b76a902 100644 --- a/spring-context/src/test/java/org/springframework/context/conversionservice/ConversionServiceContextConfigTests.java +++ b/spring-context/src/test/java/org/springframework/context/conversionservice/ConversionServiceContextConfigTests.java @@ -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(); diff --git a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java index 35a4a3f8c23..f56f419c4ec 100644 --- a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java @@ -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(); } diff --git a/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java index d51548400b8..ba065275b0d 100644 --- a/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java @@ -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 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); } diff --git a/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java b/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java index 63f7908c0c1..76ae95e9704 100644 --- a/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java @@ -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); diff --git a/spring-context/src/test/java/org/springframework/context/support/ResourceBundleMessageSourceTests.java b/spring-context/src/test/java/org/springframework/context/support/ResourceBundleMessageSourceTests.java index a0c6fc1f18f..a3a443453dd 100644 --- a/spring-context/src/test/java/org/springframework/context/support/ResourceBundleMessageSourceTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/ResourceBundleMessageSourceTests.java @@ -389,32 +389,32 @@ class ResourceBundleMessageSourceTests { ReloadableResourceBundleMessageSource ms = new ReloadableResourceBundleMessageSource(); List 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 diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java index a67e98ee503..b87abbe704c 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java @@ -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); diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java index 81f6ec10490..a1cd409d205 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java @@ -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 fixedRateTasks = (List) 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 fixedRateTasks = (List) 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 fixedRateTasks = (List) 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 cronTasks = (List) 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 cronTasks = (List) 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 cronTasks = (List) 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 fixedRateTasks = (List) 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 fixedRateTasks = (List) 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 cronTasks = (List) 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 cronTasks = (List) 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 fixedDelayTasks = (List) 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 fixedRateTasks = (List) 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 cronTasks = (List) 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 cronTasks = (List) 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 cronTasks = (List) 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(); diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java index c53053ff0b2..fe3dd0baba3 100644 --- a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java @@ -463,7 +463,7 @@ public class GroovyScriptFactoryTests { public void testAnonymousScriptDetected() throws Exception { ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd.xml", getClass()); Map 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(); } diff --git a/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java b/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java index 93669ec3b21..204a8c32e2a 100644 --- a/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java +++ b/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java @@ -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) null); - assertThat(model.size()).isEqualTo(0); + assertThat(model).hasSize(0); } @Test public void testAddAllObjectsWithNullCollection() throws Exception { ModelMap model = new ModelMap(); model.addAllAttributes((Collection) 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"); } diff --git a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java index 546c599c01f..9bc185c320f 100644 --- a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java +++ b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java @@ -1926,7 +1926,7 @@ class DataBinderTests { List list = (List) 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); } diff --git a/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java b/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java index ffcb2909541..bcbeda94f7c 100644 --- a/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java @@ -68,7 +68,7 @@ class ValidatorFactoryTests { ValidPerson person = new ValidPerson(); Set> result = validator.validate(person); - assertThat(result.size()).isEqualTo(2); + assertThat(result).hasSize(2); for (ConstraintViolation 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> result = validator.validate(person); - assertThat(result.size()).isEqualTo(2); + assertThat(result).hasSize(2); for (ConstraintViolation 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> result = validator.validate(person); - assertThat(result.size()).isEqualTo(1); + assertThat(result).hasSize(1); Iterator> 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 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 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 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(); diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractCacheTests.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractCacheTests.java index e01074417a1..06cddb9373b 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractCacheTests.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractCacheTests.java @@ -204,7 +204,7 @@ public abstract class AbstractCacheTests { } latch.await(); - assertThat(results.size()).isEqualTo(10); + assertThat(results).hasSize(10); results.forEach(r -> assertThat(r).isEqualTo(1)); // Only one method got invoked } diff --git a/spring-core/src/test/java/org/springframework/core/ConstantsTests.java b/spring-core/src/test/java/org/springframework/core/ConstantsTests.java index a7331ec97de..a994c4f4b9c 100644 --- a/spring-core/src/test/java/org/springframework/core/ConstantsTests.java +++ b/spring-core/src/test/java/org/springframework/core/ConstantsTests.java @@ -56,17 +56,17 @@ class ConstantsTests { Constants c = new Constants(A.class); Set names = c.getNames(""); - assertThat(names.size()).isEqualTo(c.getSize()); + assertThat(names).hasSize(c.getSize()); assertThat(names.contains("DOG")).isTrue(); assertThat(names.contains("CAT")).isTrue(); assertThat(names.contains("S1")).isTrue(); names = c.getNames("D"); - assertThat(names.size()).isEqualTo(1); + assertThat(names).hasSize(1); assertThat(names.contains("DOG")).isTrue(); names = c.getNames("d"); - assertThat(names.size()).isEqualTo(1); + assertThat(names).hasSize(1); assertThat(names.contains("DOG")).isTrue(); } @@ -75,22 +75,22 @@ class ConstantsTests { Constants c = new Constants(A.class); Set values = c.getValues(""); - assertThat(values.size()).isEqualTo(7); + assertThat(values).hasSize(7); assertThat(values.contains(0)).isTrue(); assertThat(values.contains(66)).isTrue(); assertThat(values.contains("")).isTrue(); values = c.getValues("D"); - assertThat(values.size()).isEqualTo(1); + assertThat(values).hasSize(1); assertThat(values.contains(0)).isTrue(); values = c.getValues("prefix"); - assertThat(values.size()).isEqualTo(2); + assertThat(values).hasSize(2); assertThat(values.contains(1)).isTrue(); assertThat(values.contains(2)).isTrue(); values = c.getValuesForProperty("myProperty"); - assertThat(values.size()).isEqualTo(2); + assertThat(values).hasSize(2); assertThat(values.contains(1)).isTrue(); assertThat(values.contains(2)).isTrue(); } @@ -103,22 +103,22 @@ class ConstantsTests { Constants c = new Constants(A.class); Set values = c.getValues(""); - assertThat(values.size()).isEqualTo(7); + assertThat(values).hasSize(7); assertThat(values.contains(0)).isTrue(); assertThat(values.contains(66)).isTrue(); assertThat(values.contains("")).isTrue(); values = c.getValues("D"); - assertThat(values.size()).isEqualTo(1); + assertThat(values).hasSize(1); assertThat(values.contains(0)).isTrue(); values = c.getValues("prefix"); - assertThat(values.size()).isEqualTo(2); + assertThat(values).hasSize(2); assertThat(values.contains(1)).isTrue(); assertThat(values.contains(2)).isTrue(); values = c.getValuesForProperty("myProperty"); - assertThat(values.size()).isEqualTo(2); + assertThat(values).hasSize(2); assertThat(values.contains(1)).isTrue(); assertThat(values.contains(2)).isTrue(); } @@ -132,12 +132,12 @@ class ConstantsTests { Constants c = new Constants(A.class); Set names = c.getNamesForSuffix("_PROPERTY"); - assertThat(names.size()).isEqualTo(2); + assertThat(names).hasSize(2); assertThat(names.contains("NO_PROPERTY")).isTrue(); assertThat(names.contains("YES_PROPERTY")).isTrue(); Set values = c.getValuesForSuffix("_PROPERTY"); - assertThat(values.size()).isEqualTo(2); + assertThat(values).hasSize(2); assertThat(values.contains(3)).isTrue(); assertThat(values.contains(4)).isTrue(); } @@ -217,7 +217,7 @@ class ConstantsTests { assertThat(c.getSize()).isEqualTo(0); final Set values = c.getValues(""); assertThat(values).isNotNull(); - assertThat(values.size()).isEqualTo(0); + assertThat(values).hasSize(0); } @Test diff --git a/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java b/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java index efd1f67aff3..366312c2bdb 100644 --- a/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java +++ b/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java @@ -121,7 +121,7 @@ class GenericTypeResolverTests { assertThat(map.toString()).isEqualTo("{T=class java.lang.Integer}"); map = GenericTypeResolver.getTypeVariableMap(TypedTopLevelClass.TypedNested.class); - assertThat(map.size()).isEqualTo(2); + assertThat(map).hasSize(2); Type t = null; Type x = null; for (Map.Entry entry : map.entrySet()) { diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java index aea76fca67c..c70c576559b 100644 --- a/spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java @@ -874,7 +874,7 @@ class AnnotatedElementUtilsTests { void findAllMergedAnnotationsOnClassWithInterface() throws Exception { Method method = TransactionalServiceImpl.class.getMethod("doIt"); Set allMergedAnnotations = findAllMergedAnnotations(method, Transactional.class); - assertThat(allMergedAnnotations.size()).isEqualTo(1); + assertThat(allMergedAnnotations).hasSize(1); } @Test // SPR-16060 diff --git a/spring-core/src/test/java/org/springframework/core/annotation/ComposedRepeatableAnnotationsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/ComposedRepeatableAnnotationsTests.java index 655013383dc..620eedf84ca 100644 --- a/spring-core/src/test/java/org/springframework/core/annotation/ComposedRepeatableAnnotationsTests.java +++ b/spring-core/src/test/java/org/springframework/core/annotation/ComposedRepeatableAnnotationsTests.java @@ -112,7 +112,7 @@ class ComposedRepeatableAnnotationsTests { Class element = SubNoninheritedRepeatableClass.class; Set annotations = getMergedRepeatableAnnotations(element, Noninherited.class); assertThat(annotations).isNotNull(); - assertThat(annotations.size()).isEqualTo(0); + assertThat(annotations).hasSize(0); } @Test @@ -216,7 +216,7 @@ class ComposedRepeatableAnnotationsTests { Set peteRepeats = getMergedRepeatableAnnotations(element, PeteRepeat.class); assertThat(peteRepeats).isNotNull(); - assertThat(peteRepeats.size()).isEqualTo(3); + assertThat(peteRepeats).hasSize(3); Iterator iterator = peteRepeats.iterator(); assertThat(iterator.next().value()).isEqualTo("A"); @@ -229,7 +229,7 @@ class ComposedRepeatableAnnotationsTests { Set peteRepeats = findMergedRepeatableAnnotations(element, PeteRepeat.class); assertThat(peteRepeats).isNotNull(); - assertThat(peteRepeats.size()).isEqualTo(3); + assertThat(peteRepeats).hasSize(3); Iterator iterator = peteRepeats.iterator(); assertThat(iterator.next().value()).isEqualTo("A"); @@ -239,7 +239,7 @@ class ComposedRepeatableAnnotationsTests { private void assertNoninheritedRepeatableAnnotations(Set annotations) { assertThat(annotations).isNotNull(); - assertThat(annotations.size()).isEqualTo(3); + assertThat(annotations).hasSize(3); Iterator iterator = annotations.iterator(); assertThat(iterator.next().value()).isEqualTo("A"); diff --git a/spring-core/src/test/java/org/springframework/core/annotation/MultipleComposedAnnotationsOnSingleAnnotatedElementTests.java b/spring-core/src/test/java/org/springframework/core/annotation/MultipleComposedAnnotationsOnSingleAnnotatedElementTests.java index b201008380a..5bb172e5b2f 100644 --- a/spring-core/src/test/java/org/springframework/core/annotation/MultipleComposedAnnotationsOnSingleAnnotatedElementTests.java +++ b/spring-core/src/test/java/org/springframework/core/annotation/MultipleComposedAnnotationsOnSingleAnnotatedElementTests.java @@ -62,7 +62,7 @@ class MultipleComposedAnnotationsOnSingleAnnotatedElementTests { Class element = MultipleNoninheritedComposedCachesClass.class; Set cacheables = getAllMergedAnnotations(element, Cacheable.class); assertThat(cacheables).isNotNull(); - assertThat(cacheables.size()).isEqualTo(2); + assertThat(cacheables).hasSize(2); Iterator iterator = cacheables.iterator(); Cacheable cacheable1 = iterator.next(); @@ -76,7 +76,7 @@ class MultipleComposedAnnotationsOnSingleAnnotatedElementTests { Class element = SubMultipleNoninheritedComposedCachesClass.class; Set cacheables = getAllMergedAnnotations(element, Cacheable.class); assertThat(cacheables).isNotNull(); - assertThat(cacheables.size()).isEqualTo(0); + assertThat(cacheables).hasSize(0); } @Test @@ -89,7 +89,7 @@ class MultipleComposedAnnotationsOnSingleAnnotatedElementTests { Class element = MultipleComposedCachesOnInterfaceClass.class; Set cacheables = getAllMergedAnnotations(element, Cacheable.class); assertThat(cacheables).isNotNull(); - assertThat(cacheables.size()).isEqualTo(0); + assertThat(cacheables).hasSize(0); } @Test @@ -109,7 +109,7 @@ class MultipleComposedAnnotationsOnSingleAnnotatedElementTests { void getMultipleComposedAnnotationsOnBridgeMethod() throws Exception { Set cacheables = getAllMergedAnnotations(getBridgeMethod(), Cacheable.class); assertThat(cacheables).isNotNull(); - assertThat(cacheables.size()).isEqualTo(0); + assertThat(cacheables).hasSize(0); } @Test @@ -127,7 +127,7 @@ class MultipleComposedAnnotationsOnSingleAnnotatedElementTests { Class element = MultipleNoninheritedComposedCachesClass.class; Set cacheables = findAllMergedAnnotations(element, Cacheable.class); assertThat(cacheables).isNotNull(); - assertThat(cacheables.size()).isEqualTo(2); + assertThat(cacheables).hasSize(2); Iterator iterator = cacheables.iterator(); Cacheable cacheable1 = iterator.next(); @@ -141,7 +141,7 @@ class MultipleComposedAnnotationsOnSingleAnnotatedElementTests { Class element = SubMultipleNoninheritedComposedCachesClass.class; Set cacheables = findAllMergedAnnotations(element, Cacheable.class); assertThat(cacheables).isNotNull(); - assertThat(cacheables.size()).isEqualTo(2); + assertThat(cacheables).hasSize(2); Iterator iterator = cacheables.iterator(); Cacheable cacheable1 = iterator.next(); @@ -213,7 +213,7 @@ class MultipleComposedAnnotationsOnSingleAnnotatedElementTests { Set cacheables = getAllMergedAnnotations(element, Cacheable.class); assertThat(cacheables).isNotNull(); - assertThat(cacheables.size()).isEqualTo(2); + assertThat(cacheables).hasSize(2); Iterator iterator = cacheables.iterator(); Cacheable fooCacheable = iterator.next(); @@ -229,7 +229,7 @@ class MultipleComposedAnnotationsOnSingleAnnotatedElementTests { Set cacheables = findAllMergedAnnotations(element, Cacheable.class); assertThat(cacheables).isNotNull(); - assertThat(cacheables.size()).isEqualTo(2); + assertThat(cacheables).hasSize(2); Iterator iterator = cacheables.iterator(); Cacheable fooCacheable = iterator.next(); diff --git a/spring-core/src/test/java/org/springframework/core/convert/converter/DefaultConversionServiceTests.java b/spring-core/src/test/java/org/springframework/core/convert/converter/DefaultConversionServiceTests.java index 3f875f4bbec..33b1f10d906 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/converter/DefaultConversionServiceTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/converter/DefaultConversionServiceTests.java @@ -681,7 +681,7 @@ class DefaultConversionServiceTests { Collection values = map.values(); List bar = (List) conversionService.convert(values, TypeDescriptor.forObject(values), new TypeDescriptor(getClass().getField("genericList"))); - assertThat(bar.size()).isEqualTo(3); + assertThat(bar).hasSize(3); assertThat(bar.get(0)).isEqualTo(1); assertThat(bar.get(1)).isEqualTo(2); assertThat(bar.get(2)).isEqualTo(3); @@ -745,7 +745,7 @@ class DefaultConversionServiceTests { @Test void convertStringToProperties() { Properties result = conversionService.convert("a=b\nc=2\nd=", Properties.class); - assertThat(result.size()).isEqualTo(3); + assertThat(result).hasSize(3); assertThat(result.getProperty("a")).isEqualTo("b"); assertThat(result.getProperty("c")).isEqualTo("2"); assertThat(result.getProperty("d")).isEqualTo(""); diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java index b7eca2c6047..19ea2a10bc2 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java @@ -195,7 +195,7 @@ class CollectionToCollectionConverterTests { aSource, TypeDescriptor.forObject(aSource), TypeDescriptor.forObject(new ArrayList())); boolean condition = myConverted instanceof ArrayList; assertThat(condition).isTrue(); - assertThat(((ArrayList) myConverted).size()).isEqualTo(aSource.size()); + assertThat(((ArrayList) myConverted)).hasSize(aSource.size()); } @Test diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/MapToMapConverterTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/MapToMapConverterTests.java index fd900a79e77..3d97fc39a81 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/MapToMapConverterTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/MapToMapConverterTests.java @@ -240,7 +240,7 @@ class MapToMapConverterTests { TypeDescriptor targetType = new TypeDescriptor(getClass().getField("multiValueMapTarget")); MultiValueMap converted = (MultiValueMap) conversionService.convert(source, targetType); - assertThat(converted.size()).isEqualTo(2); + assertThat(converted).hasSize(2); assertThat(converted.get("a")).isEqualTo(Arrays.asList("1", "2", "3")); assertThat(converted.get("b")).isEqualTo(Arrays.asList("4", "5", "6")); } @@ -255,7 +255,7 @@ class MapToMapConverterTests { TypeDescriptor targetType = new TypeDescriptor(getClass().getField("multiValueMapTarget")); MultiValueMap converted = (MultiValueMap) conversionService.convert(source, targetType); - assertThat(converted.size()).isEqualTo(2); + assertThat(converted).hasSize(2); assertThat(converted.get("a")).isEqualTo(Arrays.asList("1")); assertThat(converted.get("b")).isEqualTo(Arrays.asList("2")); } diff --git a/spring-core/src/test/java/org/springframework/core/env/MutablePropertySourcesTests.java b/spring-core/src/test/java/org/springframework/core/env/MutablePropertySourcesTests.java index 222104a2a32..400862a6563 100644 --- a/spring-core/src/test/java/org/springframework/core/env/MutablePropertySourcesTests.java +++ b/spring-core/src/test/java/org/springframework/core/env/MutablePropertySourcesTests.java @@ -39,7 +39,7 @@ class MutablePropertySourcesTests { sources.addLast(new MockPropertySource("d").withProperty("p1", "dValue")); sources.addLast(new MockPropertySource("f").withProperty("p1", "fValue")); - assertThat(sources.size()).isEqualTo(3); + assertThat(sources).hasSize(3); assertThat(sources.contains("a")).isFalse(); assertThat(sources.contains("b")).isTrue(); assertThat(sources.contains("c")).isFalse(); @@ -56,7 +56,7 @@ class MutablePropertySourcesTests { sources.addBefore("b", new MockPropertySource("a")); sources.addAfter("b", new MockPropertySource("c")); - assertThat(sources.size()).isEqualTo(5); + assertThat(sources).hasSize(5); assertThat(sources.precedenceOf(PropertySource.named("a"))).isEqualTo(0); assertThat(sources.precedenceOf(PropertySource.named("b"))).isEqualTo(1); assertThat(sources.precedenceOf(PropertySource.named("c"))).isEqualTo(2); @@ -66,7 +66,7 @@ class MutablePropertySourcesTests { sources.addBefore("f", new MockPropertySource("e")); sources.addAfter("f", new MockPropertySource("g")); - assertThat(sources.size()).isEqualTo(7); + assertThat(sources).hasSize(7); assertThat(sources.precedenceOf(PropertySource.named("a"))).isEqualTo(0); assertThat(sources.precedenceOf(PropertySource.named("b"))).isEqualTo(1); assertThat(sources.precedenceOf(PropertySource.named("c"))).isEqualTo(2); @@ -76,7 +76,7 @@ class MutablePropertySourcesTests { assertThat(sources.precedenceOf(PropertySource.named("g"))).isEqualTo(6); sources.addLast(new MockPropertySource("a")); - assertThat(sources.size()).isEqualTo(7); + assertThat(sources).hasSize(7); assertThat(sources.precedenceOf(PropertySource.named("b"))).isEqualTo(0); assertThat(sources.precedenceOf(PropertySource.named("c"))).isEqualTo(1); assertThat(sources.precedenceOf(PropertySource.named("d"))).isEqualTo(2); @@ -86,7 +86,7 @@ class MutablePropertySourcesTests { assertThat(sources.precedenceOf(PropertySource.named("a"))).isEqualTo(6); sources.addFirst(new MockPropertySource("a")); - assertThat(sources.size()).isEqualTo(7); + assertThat(sources).hasSize(7); assertThat(sources.precedenceOf(PropertySource.named("a"))).isEqualTo(0); assertThat(sources.precedenceOf(PropertySource.named("b"))).isEqualTo(1); assertThat(sources.precedenceOf(PropertySource.named("c"))).isEqualTo(2); @@ -96,11 +96,11 @@ class MutablePropertySourcesTests { assertThat(sources.precedenceOf(PropertySource.named("g"))).isEqualTo(6); assertThat(PropertySource.named("a")).isEqualTo(sources.remove("a")); - assertThat(sources.size()).isEqualTo(6); + assertThat(sources).hasSize(6); assertThat(sources.contains("a")).isFalse(); assertThat((Object) sources.remove("a")).isNull(); - assertThat(sources.size()).isEqualTo(6); + assertThat(sources).hasSize(6); String bogusPS = "bogus"; assertThatIllegalArgumentException().isThrownBy(() -> @@ -108,13 +108,13 @@ class MutablePropertySourcesTests { .withMessageContaining("does not exist"); sources.addFirst(new MockPropertySource("a")); - assertThat(sources.size()).isEqualTo(7); + assertThat(sources).hasSize(7); assertThat(sources.precedenceOf(PropertySource.named("a"))).isEqualTo(0); assertThat(sources.precedenceOf(PropertySource.named("b"))).isEqualTo(1); assertThat(sources.precedenceOf(PropertySource.named("c"))).isEqualTo(2); sources.replace("a", new MockPropertySource("a-replaced")); - assertThat(sources.size()).isEqualTo(7); + assertThat(sources).hasSize(7); assertThat(sources.precedenceOf(PropertySource.named("a-replaced"))).isEqualTo(0); assertThat(sources.precedenceOf(PropertySource.named("b"))).isEqualTo(1); assertThat(sources.precedenceOf(PropertySource.named("c"))).isEqualTo(2); diff --git a/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java b/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java index c7f9d0a3b03..2122e3b224b 100644 --- a/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java +++ b/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java @@ -114,7 +114,7 @@ class AnnotationMetadataTests { assertThat(metadata.getAnnotationAttributes(Component.class.getName())).isNull(); assertThat(metadata.getAnnotationAttributes(MetaAnnotation.class.getName(), false)).isNull(); assertThat(metadata.getAnnotationAttributes(MetaAnnotation.class.getName(), true)).isNull(); - assertThat(metadata.getAnnotatedMethods(DirectAnnotation.class.getName()).size()).isEqualTo(0); + assertThat(metadata.getAnnotatedMethods(DirectAnnotation.class.getName())).hasSize(0); assertThat(metadata.isAnnotated(IsAnnotatedAnnotation.class.getName())).isFalse(); assertThat(metadata.getAllAnnotationAttributes(DirectAnnotation.class.getName())).isNull(); } diff --git a/spring-core/src/test/java/org/springframework/tests/MockitoUtils.java b/spring-core/src/test/java/org/springframework/tests/MockitoUtils.java index 60df908e601..e14f7419906 100644 --- a/spring-core/src/test/java/org/springframework/tests/MockitoUtils.java +++ b/spring-core/src/test/java/org/springframework/tests/MockitoUtils.java @@ -50,7 +50,7 @@ public abstract class MockitoUtils { private static void verifySameInvocations(List expectedInvocations, List actualInvocations, InvocationArgumentsAdapter... argumentAdapters) { - assertThat(expectedInvocations.size()).isEqualTo(actualInvocations.size()); + assertThat(expectedInvocations).hasSize(actualInvocations.size()); for (int i = 0; i < expectedInvocations.size(); i++) { verifySameInvocation(expectedInvocations.get(i), actualInvocations.get(i), argumentAdapters); } diff --git a/spring-core/src/test/java/org/springframework/util/AntPathMatcherTests.java b/spring-core/src/test/java/org/springframework/util/AntPathMatcherTests.java index 71eb80a23f0..cee574910b7 100644 --- a/spring-core/src/test/java/org/springframework/util/AntPathMatcherTests.java +++ b/spring-core/src/test/java/org/springframework/util/AntPathMatcherTests.java @@ -647,22 +647,22 @@ class AntPathMatcherTests { @Test void preventCreatingStringMatchersIfPathDoesNotStartsWithPatternPrefix() { pathMatcher.setCachePatterns(true); - assertThat(pathMatcher.stringMatcherCache.size()).isEqualTo(0); + assertThat(pathMatcher.stringMatcherCache).hasSize(0); pathMatcher.match("test?", "test"); - assertThat(pathMatcher.stringMatcherCache.size()).isEqualTo(1); + assertThat(pathMatcher.stringMatcherCache).hasSize(1); pathMatcher.match("test?", "best"); pathMatcher.match("test/*", "view/test.jpg"); pathMatcher.match("test/**/test.jpg", "view/test.jpg"); pathMatcher.match("test/{name}.jpg", "view/test.jpg"); - assertThat(pathMatcher.stringMatcherCache.size()).isEqualTo(1); + assertThat(pathMatcher.stringMatcherCache).hasSize(1); } @Test void creatingStringMatchersIfPatternPrefixCannotDetermineIfPathMatch() { pathMatcher.setCachePatterns(true); - assertThat(pathMatcher.stringMatcherCache.size()).isEqualTo(0); + assertThat(pathMatcher.stringMatcherCache).hasSize(0); pathMatcher.match("test", "testian"); pathMatcher.match("test?", "testFf"); @@ -673,7 +673,7 @@ class AntPathMatcherTests { pathMatcher.match("/**/{name}.jpg", "/test/lorem.jpg"); pathMatcher.match("/*/dir/{name}.jpg", "/*/dir/lorem.jpg"); - assertThat(pathMatcher.stringMatcherCache.size()).isEqualTo(7); + assertThat(pathMatcher.stringMatcherCache).hasSize(7); } @Test diff --git a/spring-core/src/test/java/org/springframework/util/LinkedCaseInsensitiveMapTests.java b/spring-core/src/test/java/org/springframework/util/LinkedCaseInsensitiveMapTests.java index 9f50d9d1e9e..0d80474d617 100644 --- a/spring-core/src/test/java/org/springframework/util/LinkedCaseInsensitiveMapTests.java +++ b/spring-core/src/test/java/org/springframework/util/LinkedCaseInsensitiveMapTests.java @@ -38,7 +38,7 @@ class LinkedCaseInsensitiveMapTests { assertThat(map.put("key", "value1")).isNull(); assertThat(map.put("key", "value2")).isEqualTo("value1"); assertThat(map.put("key", "value3")).isEqualTo("value2"); - assertThat(map.size()).isEqualTo(1); + assertThat(map).hasSize(1); assertThat(map.get("key")).isEqualTo("value3"); assertThat(map.get("KEY")).isEqualTo("value3"); assertThat(map.get("Key")).isEqualTo("value3"); @@ -55,7 +55,7 @@ class LinkedCaseInsensitiveMapTests { assertThat(map.put("key", "value1")).isNull(); assertThat(map.put("KEY", "value2")).isEqualTo("value1"); assertThat(map.put("Key", "value3")).isEqualTo("value2"); - assertThat(map.size()).isEqualTo(1); + assertThat(map).hasSize(1); assertThat(map.get("key")).isEqualTo("value3"); assertThat(map.get("KEY")).isEqualTo("value3"); assertThat(map.get("Key")).isEqualTo("value3"); @@ -128,8 +128,8 @@ class LinkedCaseInsensitiveMapTests { assertThat(copy.get("Key")).isEqualTo("value1"); copy.put("Key", "value2"); - assertThat(map.size()).isEqualTo(1); - assertThat(copy.size()).isEqualTo(1); + assertThat(map).hasSize(1); + assertThat(copy).hasSize(1); assertThat(map.get("key")).isEqualTo("value1"); assertThat(map.get("KEY")).isEqualTo("value1"); assertThat(map.get("Key")).isEqualTo("value1"); @@ -159,7 +159,7 @@ class LinkedCaseInsensitiveMapTests { void removeFromKeySetViaIterator() { map.put("key", "value"); nextAndRemove(map.keySet().iterator()); - assertThat(map.size()).isEqualTo(0); + assertThat(map).hasSize(0); map.computeIfAbsent("key", k -> "newvalue"); assertThat(map.get("key")).isEqualTo("newvalue"); } @@ -168,7 +168,7 @@ class LinkedCaseInsensitiveMapTests { void clearFromValues() { map.put("key", "value"); map.values().clear(); - assertThat(map.size()).isEqualTo(0); + assertThat(map).hasSize(0); map.computeIfAbsent("key", k -> "newvalue"); assertThat(map.get("key")).isEqualTo("newvalue"); } @@ -177,7 +177,7 @@ class LinkedCaseInsensitiveMapTests { void removeFromValues() { map.put("key", "value"); map.values().remove("value"); - assertThat(map.size()).isEqualTo(0); + assertThat(map).hasSize(0); map.computeIfAbsent("key", k -> "newvalue"); assertThat(map.get("key")).isEqualTo("newvalue"); } @@ -186,7 +186,7 @@ class LinkedCaseInsensitiveMapTests { void removeFromValuesViaIterator() { map.put("key", "value"); nextAndRemove(map.values().iterator()); - assertThat(map.size()).isEqualTo(0); + assertThat(map).hasSize(0); map.computeIfAbsent("key", k -> "newvalue"); assertThat(map.get("key")).isEqualTo("newvalue"); } @@ -195,7 +195,7 @@ class LinkedCaseInsensitiveMapTests { void clearFromEntrySet() { map.put("key", "value"); map.entrySet().clear(); - assertThat(map.size()).isEqualTo(0); + assertThat(map).hasSize(0); map.computeIfAbsent("key", k -> "newvalue"); assertThat(map.get("key")).isEqualTo("newvalue"); } @@ -204,7 +204,7 @@ class LinkedCaseInsensitiveMapTests { void removeFromEntrySet() { map.put("key", "value"); map.entrySet().remove(map.entrySet().iterator().next()); - assertThat(map.size()).isEqualTo(0); + assertThat(map).hasSize(0); map.computeIfAbsent("key", k -> "newvalue"); assertThat(map.get("key")).isEqualTo("newvalue"); } @@ -213,7 +213,7 @@ class LinkedCaseInsensitiveMapTests { void removeFromEntrySetViaIterator() { map.put("key", "value"); nextAndRemove(map.entrySet().iterator()); - assertThat(map.size()).isEqualTo(0); + assertThat(map).hasSize(0); map.computeIfAbsent("key", k -> "newvalue"); assertThat(map.get("key")).isEqualTo("newvalue"); } diff --git a/spring-core/src/test/java/org/springframework/util/MimeTypeTests.java b/spring-core/src/test/java/org/springframework/util/MimeTypeTests.java index 9c62f82be10..8ed0385bf80 100644 --- a/spring-core/src/test/java/org/springframework/util/MimeTypeTests.java +++ b/spring-core/src/test/java/org/springframework/util/MimeTypeTests.java @@ -344,7 +344,7 @@ class MimeTypeTests { String s = String.join(",", mimeTypes); List actual = MimeTypeUtils.parseMimeTypes(s); - assertThat(actual.size()).isEqualTo(mimeTypes.length); + assertThat(actual).hasSize(mimeTypes.length); for (int i = 0; i < mimeTypes.length; i++) { assertThat(actual.get(i).toString()).isEqualTo(mimeTypes[i]); } diff --git a/spring-core/src/test/java/org/springframework/util/UnmodifiableMultiValueMapTests.java b/spring-core/src/test/java/org/springframework/util/UnmodifiableMultiValueMapTests.java index a489ccf4110..8fef9ca226a 100644 --- a/spring-core/src/test/java/org/springframework/util/UnmodifiableMultiValueMapTests.java +++ b/spring-core/src/test/java/org/springframework/util/UnmodifiableMultiValueMapTests.java @@ -47,7 +47,7 @@ class UnmodifiableMultiValueMapTests { UnmodifiableMultiValueMap map = new UnmodifiableMultiValueMap<>(mock); given(mock.size()).willReturn(1); - assertThat(map.size()).isEqualTo(1); + assertThat(map).hasSize(1); given(mock.isEmpty()).willReturn(false); assertThat(map.isEmpty()).isFalse(); @@ -107,7 +107,7 @@ class UnmodifiableMultiValueMapTests { Set>> set = new UnmodifiableMultiValueMap<>(mockMap).entrySet(); given(mockSet.size()).willReturn(1); - assertThat(set.size()).isEqualTo(1); + assertThat(set).hasSize(1); given(mockSet.isEmpty()).willReturn(false); assertThat(set.isEmpty()).isFalse(); @@ -149,7 +149,7 @@ class UnmodifiableMultiValueMapTests { Collection> values = new UnmodifiableMultiValueMap<>(mockMap).values(); given(mockValues.size()).willReturn(1); - assertThat(values.size()).isEqualTo(1); + assertThat(values).hasSize(1); given(mockValues.isEmpty()).willReturn(false); assertThat(values.isEmpty()).isFalse(); diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java index b925832d10e..e1a84d991f3 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java @@ -156,19 +156,19 @@ public class ConstructorInvocationTests extends AbstractExpressionTests { // reflective constructor accessor is the only one by default List constructorResolvers = ctx.getConstructorResolvers(); - assertThat(constructorResolvers.size()).isEqualTo(1); + assertThat(constructorResolvers).hasSize(1); ConstructorResolver dummy = new DummyConstructorResolver(); ctx.addConstructorResolver(dummy); - assertThat(ctx.getConstructorResolvers().size()).isEqualTo(2); + assertThat(ctx.getConstructorResolvers()).hasSize(2); List copy = new ArrayList<>(ctx.getConstructorResolvers()); assertThat(ctx.removeConstructorResolver(dummy)).isTrue(); assertThat(ctx.removeConstructorResolver(dummy)).isFalse(); - assertThat(ctx.getConstructorResolvers().size()).isEqualTo(1); + assertThat(ctx.getConstructorResolvers()).hasSize(1); ctx.setConstructorResolvers(copy); - assertThat(ctx.getConstructorResolvers().size()).isEqualTo(2); + assertThat(ctx.getConstructorResolvers()).hasSize(2); } diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java index 166a46783e5..ecb29fb6a0f 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java @@ -70,14 +70,14 @@ class EvaluationTests extends AbstractExpressionTests { assertThat(o).isEqualTo(""); o = parser.parseExpression("list[3]").getValue(new StandardEvaluationContext(testClass)); assertThat(o).isEqualTo(""); - assertThat(testClass.list.size()).isEqualTo(4); + assertThat(testClass.list).hasSize(4); assertThatExceptionOfType(EvaluationException.class).isThrownBy(() -> parser.parseExpression("list2[3]").getValue(new StandardEvaluationContext(testClass))); o = parser.parseExpression("foo[3]").getValue(new StandardEvaluationContext(testClass)); assertThat(o).isEqualTo(""); - assertThat(testClass.getFoo().size()).isEqualTo(4); + assertThat(testClass.getFoo()).hasSize(4); } @Test @@ -319,7 +319,7 @@ class EvaluationTests extends AbstractExpressionTests { ExpressionParser parser = new SpelExpressionParser(new SpelParserConfiguration(true, true)); Expression e = parser.parseExpression("listOfStrings[++index3]='def'"); e.getValue(ctx); - assertThat(instance.listOfStrings.size()).isEqualTo(2); + assertThat(instance.listOfStrings).hasSize(2); assertThat(instance.listOfStrings.get(1)).isEqualTo("def"); // Check reference beyond end of collection @@ -351,14 +351,14 @@ class EvaluationTests extends AbstractExpressionTests { SpelExpressionParser parser = new SpelExpressionParser( new SpelParserConfiguration(true, true, 3)); Expression e = parser.parseExpression("foo[2]"); e.setValue(ctx, "2"); - assertThat(instance.getFoo().size()).isEqualTo(3); + assertThat(instance.getFoo()).hasSize(3); e = parser.parseExpression("foo[3]"); try { e.setValue(ctx, "3"); } catch (SpelEvaluationException see) { assertThat(see.getMessageCode()).isEqualTo(SpelMessage.UNABLE_TO_GROW_COLLECTION); - assertThat(instance.getFoo().size()).isEqualTo(3); + assertThat(instance.getFoo()).hasSize(3); } } diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java index 722b385f21b..7b59007195e 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java @@ -220,19 +220,19 @@ public class MethodInvocationTests extends AbstractExpressionTests { // reflective method accessor is the only one by default List methodResolvers = ctx.getMethodResolvers(); - assertThat(methodResolvers.size()).isEqualTo(1); + assertThat(methodResolvers).hasSize(1); MethodResolver dummy = new DummyMethodResolver(); ctx.addMethodResolver(dummy); - assertThat(ctx.getMethodResolvers().size()).isEqualTo(2); + assertThat(ctx.getMethodResolvers()).hasSize(2); List copy = new ArrayList<>(ctx.getMethodResolvers()); assertThat(ctx.removeMethodResolver(dummy)).isTrue(); assertThat(ctx.removeMethodResolver(dummy)).isFalse(); - assertThat(ctx.getMethodResolvers().size()).isEqualTo(1); + assertThat(ctx.getMethodResolvers()).hasSize(1); ctx.setMethodResolvers(copy); - assertThat(ctx.getMethodResolvers().size()).isEqualTo(2); + assertThat(ctx.getMethodResolvers()).hasSize(2); } @Test diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SelectionAndProjectionTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SelectionAndProjectionTests.java index c7ce3cad9f5..c835c632623 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/SelectionAndProjectionTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/SelectionAndProjectionTests.java @@ -189,7 +189,7 @@ class SelectionAndProjectionTests { Expression exp = parser.parseExpression("colors.^[key.startsWith('b')]"); Map colorsMap = (Map) exp.getValue(context); - assertThat(colorsMap.size()).isEqualTo(1); + assertThat(colorsMap).hasSize(1); assertThat(colorsMap.keySet().iterator().next()).isEqualTo("beige"); } @@ -201,7 +201,7 @@ class SelectionAndProjectionTests { Expression exp = parser.parseExpression("colors.$[key.startsWith('b')]"); Map colorsMap = (Map) exp.getValue(context); - assertThat(colorsMap.size()).isEqualTo(1); + assertThat(colorsMap).hasSize(1); assertThat(colorsMap.keySet().iterator().next()).isEqualTo("brown"); } diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java index 280b452007b..09aef6b7f8e 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java @@ -445,7 +445,7 @@ class SpelDocumentationTests extends AbstractExpressionTests { StandardEvaluationContext societyContext = new StandardEvaluationContext(); societyContext.setRootObject(new IEEE()); List list = (List) parser.parseExpression("Members2.?[nationality == 'Serbian']").getValue(societyContext); - assertThat(list.size()).isEqualTo(1); + assertThat(list).hasSize(1); assertThat(list.get(0).getName()).isEqualTo("Nikola Tesla"); } diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeLocatorTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeLocatorTests.java index bdd022d80c7..4919bae41ff 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeLocatorTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeLocatorTests.java @@ -40,7 +40,7 @@ class StandardTypeLocatorTests { assertThat(locator.findType("java.lang.String")).isEqualTo(String.class); List prefixes = locator.getImportPrefixes(); - assertThat(prefixes.size()).isEqualTo(1); + assertThat(prefixes).hasSize(1); assertThat(prefixes.contains("java.lang")).isTrue(); assertThat(prefixes.contains("java.util")).isFalse(); diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/support/StandardComponentsTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/support/StandardComponentsTests.java index 62bd171e0b7..5997478f2c5 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/support/StandardComponentsTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/support/StandardComponentsTests.java @@ -59,13 +59,13 @@ public class StandardComponentsTests { public void testStandardTypeLocator() { StandardTypeLocator tl = new StandardTypeLocator(); List prefixes = tl.getImportPrefixes(); - assertThat(prefixes.size()).isEqualTo(1); + assertThat(prefixes).hasSize(1); tl.registerImport("java.util"); prefixes = tl.getImportPrefixes(); - assertThat(prefixes.size()).isEqualTo(2); + assertThat(prefixes).hasSize(2); tl.removeImport("java.util"); prefixes = tl.getImportPrefixes(); - assertThat(prefixes.size()).isEqualTo(1); + assertThat(prefixes).hasSize(1); } @Test diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java index e3464094f65..c61294165a1 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java @@ -110,7 +110,7 @@ public class InitializeDatabaseIntegrationTests { context = new ClassPathXmlApplicationContext("org/springframework/jdbc/config/jdbc-initialize-cache-config.xml"); assertCorrectSetup(context.getBean("dataSource", DataSource.class)); CacheData cache = context.getBean(CacheData.class); - assertThat(cache.getCachedData().size()).isEqualTo(1); + assertThat(cache.getCachedData()).hasSize(1); } private void assertCorrectSetup(DataSource dataSource) { diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/DataClassRowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/DataClassRowMapperTests.java index 9bacf3ae382..9a87d2c6775 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/DataClassRowMapperTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/DataClassRowMapperTests.java @@ -41,7 +41,7 @@ public class DataClassRowMapperTests extends AbstractRowMapperTests { List result = mock.getJdbcTemplate().query( "select name, age, birth_date, balance from people", new DataClassRowMapper<>(ConstructorPerson.class)); - assertThat(result.size()).isEqualTo(1); + assertThat(result).hasSize(1); verifyPerson(result.get(0)); mock.verifyClosed(); @@ -53,7 +53,7 @@ public class DataClassRowMapperTests extends AbstractRowMapperTests { List result = mock.getJdbcTemplate().query( "select name, age, birth_date, balance from people", new DataClassRowMapper<>(ConstructorPersonWithGenerics.class)); - assertThat(result.size()).isEqualTo(1); + assertThat(result).hasSize(1); ConstructorPersonWithGenerics person = result.get(0); assertThat(person.name()).isEqualTo("Bubba"); assertThat(person.age()).isEqualTo(22L); @@ -69,7 +69,7 @@ public class DataClassRowMapperTests extends AbstractRowMapperTests { List result = mock.getJdbcTemplate().query( "select name, age, birthdate, balance from people", new DataClassRowMapper<>(ConstructorPersonWithSetters.class)); - assertThat(result.size()).isEqualTo(1); + assertThat(result).hasSize(1); ConstructorPersonWithSetters person = result.get(0); assertThat(person.name()).isEqualTo("BUBBA"); assertThat(person.age()).isEqualTo(22L); @@ -85,7 +85,7 @@ public class DataClassRowMapperTests extends AbstractRowMapperTests { List result = mock.getJdbcTemplate().query( "select name, age, birth_date, balance from people", new DataClassRowMapper<>(RecordPerson.class)); - assertThat(result.size()).isEqualTo(1); + assertThat(result).hasSize(1); verifyPerson(result.get(0)); mock.verifyClosed(); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java index 6a84ffb69bd..3e85f82634b 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java @@ -1082,7 +1082,7 @@ public class JdbcTemplateTests { given(this.resultSet.getObject(2)).willReturn("second value"); Map map = this.template.queryForMap("my query"); - assertThat(map.size()).isEqualTo(1); + assertThat(map).hasSize(1); assertThat(map.get("x")).isEqualTo("first value"); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java index 22896c2d1a2..ab96d3331ae 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java @@ -83,7 +83,7 @@ public class RowMapperTests { @AfterEach public void verifyResults() { assertThat(result).isNotNull(); - assertThat(result.size()).isEqualTo(2); + assertThat(result).hasSize(2); TestBean testBean1 = result.get(0); TestBean testBean2 = result.get(1); assertThat(testBean1.getName()).isEqualTo("tb1"); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java index 31fa105d005..397a954fd85 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java @@ -283,7 +283,7 @@ public class NamedParameterJdbcTemplateTests { customers.add(cust); }); - assertThat(customers.size()).isEqualTo(1); + assertThat(customers).hasSize(1); assertThat(customers.get(0).getId() == 1).as("Customer id was assigned correctly").isTrue(); assertThat(customers.get(0).getForename().equals("rod")).as("Customer forename was assigned correctly").isTrue(); verify(connection).prepareStatement(SELECT_NAMED_PARAMETERS_PARSED); @@ -308,7 +308,7 @@ public class NamedParameterJdbcTemplateTests { customers.add(cust); }); - assertThat(customers.size()).isEqualTo(1); + assertThat(customers).hasSize(1); assertThat(customers.get(0).getId() == 1).as("Customer id was assigned correctly").isTrue(); assertThat(customers.get(0).getForename().equals("rod")).as("Customer forename was assigned correctly").isTrue(); verify(connection).prepareStatement(SELECT_NO_PARAMETERS); @@ -333,7 +333,7 @@ public class NamedParameterJdbcTemplateTests { return cust; }); - assertThat(customers.size()).isEqualTo(1); + assertThat(customers).hasSize(1); assertThat(customers.get(0).getId() == 1).as("Customer id was assigned correctly").isTrue(); assertThat(customers.get(0).getForename().equals("rod")).as("Customer forename was assigned correctly").isTrue(); verify(connection).prepareStatement(SELECT_NAMED_PARAMETERS_PARSED); @@ -358,7 +358,7 @@ public class NamedParameterJdbcTemplateTests { return cust; }); - assertThat(customers.size()).isEqualTo(1); + assertThat(customers).hasSize(1); assertThat(customers.get(0).getId() == 1).as("Customer id was assigned correctly").isTrue(); assertThat(customers.get(0).getForename().equals("rod")).as("Customer forename was assigned correctly").isTrue(); verify(connection).prepareStatement(SELECT_NO_PARAMETERS); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterUtilsTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterUtilsTests.java index 0c10b1c3011..c542672413e 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterUtilsTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterUtilsTests.java @@ -224,7 +224,7 @@ public class NamedParameterUtilsTests { String sql = "select '0\\:0' as a, foo from bar where baz < DATE(:p1 23\\:59\\:59) and baz = :p2"; ParsedSql parsedSql = NamedParameterUtils.parseSqlStatement(sql); - assertThat(parsedSql.getParameterNames().size()).isEqualTo(2); + assertThat(parsedSql.getParameterNames()).hasSize(2); assertThat(parsedSql.getParameterNames().get(0)).isEqualTo("p1"); assertThat(parsedSql.getParameterNames().get(1)).isEqualTo("p2"); String finalSql = NamedParameterUtils.substituteNamedParameters(parsedSql, null); @@ -237,7 +237,7 @@ public class NamedParameterUtilsTests { String sql = "select foo from bar where baz = b:{p1}:{p2}z"; ParsedSql parsedSql = NamedParameterUtils.parseSqlStatement(sql); - assertThat(parsedSql.getParameterNames().size()).isEqualTo(2); + assertThat(parsedSql.getParameterNames()).hasSize(2); assertThat(parsedSql.getParameterNames().get(0)).isEqualTo("p1"); assertThat(parsedSql.getParameterNames().get(1)).isEqualTo("p2"); String finalSql = NamedParameterUtils.substituteNamedParameters(parsedSql, null); @@ -249,7 +249,7 @@ public class NamedParameterUtilsTests { String expectedSql = "select foo from bar where baz = b:{}z"; String sql = "select foo from bar where baz = b:{}z"; ParsedSql parsedSql = NamedParameterUtils.parseSqlStatement(sql); - assertThat(parsedSql.getParameterNames().size()).isEqualTo(0); + assertThat(parsedSql.getParameterNames()).hasSize(0); String finalSql = NamedParameterUtils.substituteNamedParameters(parsedSql, null); assertThat(finalSql).isEqualTo(expectedSql); @@ -257,7 +257,7 @@ public class NamedParameterUtilsTests { String sql2 = "select foo from bar where baz = 'b:{p1}z'"; ParsedSql parsedSql2 = NamedParameterUtils.parseSqlStatement(sql2); - assertThat(parsedSql2.getParameterNames().size()).isEqualTo(0); + assertThat(parsedSql2.getParameterNames()).hasSize(0); String finalSql2 = NamedParameterUtils.substituteNamedParameters(parsedSql2, null); assertThat(finalSql2).isEqualTo(expectedSql2); } @@ -268,7 +268,7 @@ public class NamedParameterUtilsTests { String sql = "select foo from bar where baz = b:{p}z"; ParsedSql parsedSql = NamedParameterUtils.parseSqlStatement(sql); - assertThat(parsedSql.getParameterNames().size()).isEqualTo(1); + assertThat(parsedSql.getParameterNames()).hasSize(1); assertThat(parsedSql.getParameterNames().get(0)).isEqualTo("p"); String finalSql = NamedParameterUtils.substituteNamedParameters(parsedSql, null); assertThat(finalSql).isEqualTo(expectedSql); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java index aff13d43a7b..ef6b0901925 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java @@ -167,7 +167,7 @@ public class RdbmsOperationTests { new SqlParameter("two", Types.NUMERIC)}); operation.afterPropertiesSet(); operation.validateParameters(new Object[] { 1, "2" }); - assertThat(operation.getDeclaredParameters().size()).isEqualTo(2); + assertThat(operation.getDeclaredParameters()).hasSize(2); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java index 852d8555a7c..d013db63488 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java @@ -224,7 +224,7 @@ public class SqlUpdateTests { int rowsAffected = pc.run("rod", generatedKeyHolder); assertThat(rowsAffected).isEqualTo(1); - assertThat(generatedKeyHolder.getKeyList().size()).isEqualTo(1); + assertThat(generatedKeyHolder.getKeyList()).hasSize(1); assertThat(generatedKeyHolder.getKey().intValue()).isEqualTo(11); verify(preparedStatement).setString(1, "rod"); verify(resultSet).close(); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java index 02441425f81..e946eb2fe2c 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java @@ -317,7 +317,7 @@ public class StoredProcedureTests { assertThat(rs1).containsExactly("Foo", "Bar"); List rs2 = (List) res.get("#result-set-2"); - assertThat(rs2.size()).isEqualTo(1); + assertThat(rs2).hasSize(1); Object o2 = rs2.get(0); assertThat(o2).as("wron type returned for result set 2").isInstanceOf(Map.class); Map m2 = (Map) o2; @@ -362,7 +362,7 @@ public class StoredProcedureTests { assertThat(res.size()).as("incorrect number of returns").isEqualTo(1); List rs1 = (List) res.get("rs"); - assertThat(rs1.size()).isEqualTo(2); + assertThat(rs1).hasSize(2); assertThat(rs1.get(0)).isEqualTo("Foo"); assertThat(rs1.get(1)).isEqualTo("Bar"); verify(resultSet).close(); diff --git a/spring-jms/src/test/java/org/springframework/jms/annotation/AbstractJmsAnnotationDrivenTests.java b/spring-jms/src/test/java/org/springframework/jms/annotation/AbstractJmsAnnotationDrivenTests.java index 0dab9e4fca8..bb3840f1a66 100644 --- a/spring-jms/src/test/java/org/springframework/jms/annotation/AbstractJmsAnnotationDrivenTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/annotation/AbstractJmsAnnotationDrivenTests.java @@ -84,8 +84,8 @@ abstract class AbstractJmsAnnotationDrivenTests { context.getBean("jmsListenerContainerFactory", JmsListenerContainerTestFactory.class); JmsListenerContainerTestFactory simpleFactory = context.getBean("simpleFactory", JmsListenerContainerTestFactory.class); - assertThat(defaultFactory.getListenerContainers().size()).isEqualTo(1); - assertThat(simpleFactory.getListenerContainers().size()).isEqualTo(1); + assertThat(defaultFactory.getListenerContainers()).hasSize(1); + assertThat(simpleFactory.getListenerContainers()).hasSize(1); } /** @@ -96,7 +96,7 @@ abstract class AbstractJmsAnnotationDrivenTests { protected void testFullConfiguration(ApplicationContext context) { JmsListenerContainerTestFactory simpleFactory = context.getBean("simpleFactory", JmsListenerContainerTestFactory.class); - assertThat(simpleFactory.getListenerContainers().size()).isEqualTo(1); + assertThat(simpleFactory.getListenerContainers()).hasSize(1); MethodJmsListenerEndpoint endpoint = (MethodJmsListenerEndpoint) simpleFactory.getListenerContainers().get(0).getEndpoint(); assertThat(endpoint.getId()).isEqualTo("listener1"); @@ -121,8 +121,8 @@ abstract class AbstractJmsAnnotationDrivenTests { context.getBean("jmsListenerContainerFactory", JmsListenerContainerTestFactory.class); JmsListenerContainerTestFactory customFactory = context.getBean("customFactory", JmsListenerContainerTestFactory.class); - assertThat(defaultFactory.getListenerContainers().size()).isEqualTo(1); - assertThat(customFactory.getListenerContainers().size()).isEqualTo(1); + assertThat(defaultFactory.getListenerContainers()).hasSize(1); + assertThat(customFactory.getListenerContainers()).hasSize(1); JmsListenerEndpoint endpoint = defaultFactory.getListenerContainers().get(0).getEndpoint(); assertThat(endpoint.getClass()).as("Wrong endpoint type").isEqualTo(SimpleJmsListenerEndpoint.class); assertThat(((SimpleJmsListenerEndpoint) endpoint).getMessageListener()).as("Wrong listener set in custom endpoint").isEqualTo(context.getBean("simpleMessageListener")); @@ -143,7 +143,7 @@ abstract class AbstractJmsAnnotationDrivenTests { protected void testExplicitContainerFactoryConfiguration(ApplicationContext context) { JmsListenerContainerTestFactory defaultFactory = context.getBean("simpleFactory", JmsListenerContainerTestFactory.class); - assertThat(defaultFactory.getListenerContainers().size()).isEqualTo(1); + assertThat(defaultFactory.getListenerContainers()).hasSize(1); } /** @@ -153,7 +153,7 @@ abstract class AbstractJmsAnnotationDrivenTests { protected void testDefaultContainerFactoryConfiguration(ApplicationContext context) { JmsListenerContainerTestFactory defaultFactory = context.getBean("jmsListenerContainerFactory", JmsListenerContainerTestFactory.class); - assertThat(defaultFactory.getListenerContainers().size()).isEqualTo(1); + assertThat(defaultFactory.getListenerContainers()).hasSize(1); } /** @@ -165,7 +165,7 @@ abstract class AbstractJmsAnnotationDrivenTests { protected void testJmsHandlerMethodFactoryConfiguration(ApplicationContext context) throws JMSException { JmsListenerContainerTestFactory simpleFactory = context.getBean("defaultFactory", JmsListenerContainerTestFactory.class); - assertThat(simpleFactory.getListenerContainers().size()).isEqualTo(1); + assertThat(simpleFactory.getListenerContainers()).hasSize(1); MethodJmsListenerEndpoint endpoint = (MethodJmsListenerEndpoint) simpleFactory.getListenerContainers().get(0).getEndpoint(); @@ -182,7 +182,7 @@ abstract class AbstractJmsAnnotationDrivenTests { protected void testJmsListenerRepeatable(ApplicationContext context) { JmsListenerContainerTestFactory simpleFactory = context.getBean("jmsListenerContainerFactory", JmsListenerContainerTestFactory.class); - assertThat(simpleFactory.getListenerContainers().size()).isEqualTo(2); + assertThat(simpleFactory.getListenerContainers()).hasSize(2); MethodJmsListenerEndpoint first = (MethodJmsListenerEndpoint) simpleFactory.getListenerContainer("first").getEndpoint(); diff --git a/spring-jms/src/test/java/org/springframework/jms/annotation/EnableJmsTests.java b/spring-jms/src/test/java/org/springframework/jms/annotation/EnableJmsTests.java index 1a1d61c5235..27820f03395 100644 --- a/spring-jms/src/test/java/org/springframework/jms/annotation/EnableJmsTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/annotation/EnableJmsTests.java @@ -162,7 +162,7 @@ class EnableJmsTests extends AbstractJmsAnnotationDrivenTests { EnableJmsDefaultContainerFactoryConfig.class, ComposedJmsListenersBean.class)) { JmsListenerContainerTestFactory simpleFactory = context.getBean("jmsListenerContainerFactory", JmsListenerContainerTestFactory.class); - assertThat(simpleFactory.getListenerContainers().size()).isEqualTo(2); + assertThat(simpleFactory.getListenerContainers()).hasSize(2); MethodJmsListenerEndpoint first = (MethodJmsListenerEndpoint) simpleFactory.getListenerContainer( "first").getEndpoint(); @@ -193,10 +193,10 @@ class EnableJmsTests extends AbstractJmsAnnotationDrivenTests { EnableJmsDefaultContainerFactoryConfig.class, LazyBean.class); JmsListenerContainerTestFactory defaultFactory = context.getBean("jmsListenerContainerFactory", JmsListenerContainerTestFactory.class); - assertThat(defaultFactory.getListenerContainers().size()).isEqualTo(0); + assertThat(defaultFactory.getListenerContainers()).hasSize(0); context.getBean(LazyBean.class); // trigger lazy resolution - assertThat(defaultFactory.getListenerContainers().size()).isEqualTo(1); + assertThat(defaultFactory.getListenerContainers()).hasSize(1); MessageListenerTestContainer container = defaultFactory.getListenerContainers().get(0); assertThat(container.isStarted()).as("Should have been started " + container).isTrue(); context.close(); // close and stop the listeners diff --git a/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerEndpointRegistrarTests.java b/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerEndpointRegistrarTests.java index 40be2cabd9e..35f70af32c1 100644 --- a/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerEndpointRegistrarTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerEndpointRegistrarTests.java @@ -73,7 +73,7 @@ public class JmsListenerEndpointRegistrarTests { this.registrar.registerEndpoint(endpoint, null); this.registrar.afterPropertiesSet(); assertThat(this.registry.getListenerContainer("some id")).as("Container not created").isNotNull(); - assertThat(this.registry.getListenerContainers().size()).isEqualTo(1); + assertThat(this.registry.getListenerContainers()).hasSize(1); assertThat(this.registry.getListenerContainerIds().iterator().next()).isEqualTo("some id"); } @@ -96,7 +96,7 @@ public class JmsListenerEndpointRegistrarTests { this.registrar.registerEndpoint(endpoint); this.registrar.afterPropertiesSet(); assertThat(this.registry.getListenerContainer("myEndpoint")).as("Container not created").isNotNull(); - assertThat(this.registry.getListenerContainers().size()).isEqualTo(1); + assertThat(this.registry.getListenerContainers()).hasSize(1); assertThat(this.registry.getListenerContainerIds().iterator().next()).isEqualTo("myEndpoint"); } diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java index 160ceb125cc..f815dfcf5a2 100644 --- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java @@ -237,7 +237,7 @@ class JmsTemplateTests { tac.close(); List synchs = TransactionSynchronizationManager.getSynchronizations(); - assertThat(synchs.size()).isEqualTo(1); + assertThat(synchs).hasSize(1); TransactionSynchronization synch = synchs.get(0); synch.beforeCommit(false); synch.beforeCompletion(); diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapterTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapterTests.java index 0fb8cb022e5..276a4bcd961 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapterTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapterTests.java @@ -153,7 +153,7 @@ public class MessagingMessageListenerAdapterTests { listener.setMessageConverter(messageConverter); listener.onMessage(jmsMessage, session); verify(messageConverter, times(1)).fromMessage(jmsMessage); - assertThat(sample.simples.size()).isEqualTo(1); + assertThat(sample.simples).hasSize(1); assertThat(sample.simples.get(0).getPayload()).isEqualTo("FooBar"); } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/MessageHeadersTests.java b/spring-messaging/src/test/java/org/springframework/messaging/MessageHeadersTests.java index 5504cd811be..81a9de38c3c 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/MessageHeadersTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/MessageHeadersTests.java @@ -196,7 +196,7 @@ public class MessageHeadersTests { } MessageHeaders headers = new MyMH(); assertThat(headers.getId().toString()).isEqualTo("00000000-0000-0000-0000-000000000001"); - assertThat(headers.size()).isEqualTo(1); + assertThat(headers).hasSize(1); } } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethodTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethodTests.java index b71e88bf695..9ccadce1204 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethodTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethodTests.java @@ -51,8 +51,8 @@ public class InvocableHandlerMethodTests { Method method = ResolvableMethod.on(Handler.class).mockCall(c -> c.handle(0, "")).method(); Object value = invoke(new Handler(), method); - assertThat(getStubResolver(0).getResolvedParameters().size()).isEqualTo(1); - assertThat(getStubResolver(1).getResolvedParameters().size()).isEqualTo(1); + assertThat(getStubResolver(0).getResolvedParameters()).hasSize(1); + assertThat(getStubResolver(1).getResolvedParameters()).hasSize(1); assertThat(value).isEqualTo("99-value"); assertThat(getStubResolver(0).getResolvedParameters().get(0).getParameterName()).isEqualTo("intArg"); assertThat(getStubResolver(1).getResolvedParameters().get(0).getParameterName()).isEqualTo("stringArg"); @@ -65,8 +65,8 @@ public class InvocableHandlerMethodTests { Method method = ResolvableMethod.on(Handler.class).mockCall(c -> c.handle(0, "")).method(); Object value = invoke(new Handler(), method); - assertThat(getStubResolver(0).getResolvedParameters().size()).isEqualTo(1); - assertThat(getStubResolver(1).getResolvedParameters().size()).isEqualTo(1); + assertThat(getStubResolver(0).getResolvedParameters()).hasSize(1); + assertThat(getStubResolver(1).getResolvedParameters()).hasSize(1); assertThat(value).isEqualTo("null-null"); } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/InvocableHandlerMethodTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/InvocableHandlerMethodTests.java index ead73327bb9..6b908ef0ef7 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/InvocableHandlerMethodTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/InvocableHandlerMethodTests.java @@ -58,8 +58,8 @@ public class InvocableHandlerMethodTests { Method method = ResolvableMethod.on(Handler.class).mockCall(c -> c.handle(0, "")).method(); Object value = invokeAndBlock(new Handler(), method); - assertThat(getStubResolver(0).getResolvedParameters().size()).isEqualTo(1); - assertThat(getStubResolver(1).getResolvedParameters().size()).isEqualTo(1); + assertThat(getStubResolver(0).getResolvedParameters()).hasSize(1); + assertThat(getStubResolver(1).getResolvedParameters()).hasSize(1); assertThat(value).isEqualTo("99-value"); assertThat(getStubResolver(0).getResolvedParameters().get(0).getParameterName()).isEqualTo("intArg"); assertThat(getStubResolver(1).getResolvedParameters().get(0).getParameterName()).isEqualTo("stringArg"); @@ -72,8 +72,8 @@ public class InvocableHandlerMethodTests { Method method = ResolvableMethod.on(Handler.class).mockCall(c -> c.handle(0, "")).method(); Object value = invokeAndBlock(new Handler(), method); - assertThat(getStubResolver(0).getResolvedParameters().size()).isEqualTo(1); - assertThat(getStubResolver(1).getResolvedParameters().size()).isEqualTo(1); + assertThat(getStubResolver(0).getResolvedParameters()).hasSize(1); + assertThat(getStubResolver(1).getResolvedParameters()).hasSize(1); assertThat(value).isEqualTo("null-null"); } @@ -145,7 +145,7 @@ public class InvocableHandlerMethodTests { Object value = invokeAndBlock(handler, method); assertThat(value).isNull(); - assertThat(getStubResolver(0).getResolvedParameters().size()).isEqualTo(1); + assertThat(getStubResolver(0).getResolvedParameters()).hasSize(1); assertThat(handler.getResult()).isEqualTo("5.25"); assertThat(getStubResolver(0).getResolvedParameters().get(0).getParameterName()).isEqualTo("amount"); } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/MethodMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/MethodMessageHandlerTests.java index d651e7d35bf..10190f0f2ad 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/MethodMessageHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/MethodMessageHandlerTests.java @@ -66,7 +66,7 @@ public class MethodMessageHandlerTests { TestMethodMessageHandler messageHandler = initMethodMessageHandler(TestController.class); Map mappings = messageHandler.getHandlerMethods(); - assertThat(mappings.keySet().size()).isEqualTo(5); + assertThat(mappings.keySet()).hasSize(5); assertThat(mappings).containsOnlyKeys( "/handleMessage", "/handleMessageWithArgument", "/handleMessageWithError", "/handleMessageMatch1", "/handleMessageMatch2"); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterTests.java b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterTests.java index 7761e1d4a0e..b52c111c360 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterTests.java @@ -119,7 +119,7 @@ public class DefaultRSocketRequesterTests { assertThat(payloads).isNotNull(); if (Arrays.equals(new String[] {""}, expectedValues)) { - assertThat(payloads.size()).isEqualTo(1); + assertThat(payloads).hasSize(1); assertThat(payloads.get(0).getMetadataUtf8()).isEqualTo("toA"); assertThat(payloads.get(0).getDataUtf8()).isEqualTo(""); } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessagingTemplateTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessagingTemplateTests.java index 2062f7ceafa..1dac9acf6a8 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessagingTemplateTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessagingTemplateTests.java @@ -62,7 +62,7 @@ public class SimpMessagingTemplateTests { this.messagingTemplate.convertAndSendToUser("joe", "/queue/foo", "data"); List> messages = this.messageChannel.getMessages(); - assertThat(messages.size()).isEqualTo(1); + assertThat(messages).hasSize(1); Message message = messages.get(0); SimpMessageHeaderAccessor headerAccessor = @@ -78,7 +78,7 @@ public class SimpMessagingTemplateTests { this.messagingTemplate.convertAndSendToUser("https://joe.openid.example.org/", "/queue/foo", "data"); List> messages = this.messageChannel.getMessages(); - assertThat(messages.size()).isEqualTo(1); + assertThat(messages).hasSize(1); SimpMessageHeaderAccessor headerAccessor = MessageHeaderAccessor.getAccessor(messages.get(0), SimpMessageHeaderAccessor.class); @@ -133,7 +133,7 @@ public class SimpMessagingTemplateTests { this.messagingTemplate.convertAndSendToUser("joe", "/queue/foo", "data"); List> messages = this.messageChannel.getMessages(); - assertThat(messages.size()).isEqualTo(1); + assertThat(messages).hasSize(1); Message message = messages.get(0); SimpMessageHeaderAccessor headerAccessor = diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistryTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistryTests.java index 18970dfbb5c..18025975e2f 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistryTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistryTests.java @@ -53,17 +53,17 @@ public class DefaultSubscriptionRegistryTests { this.registry.registerSubscription(subscribeMessage(null, subsId, dest)); MultiValueMap actual = this.registry.findSubscriptions(createMessage(dest)); assertThat(actual).isNotNull(); - assertThat(actual.size()).isEqualTo(0); + assertThat(actual).hasSize(0); this.registry.registerSubscription(subscribeMessage(sessId, null, dest)); actual = this.registry.findSubscriptions(createMessage(dest)); assertThat(actual).isNotNull(); - assertThat(actual.size()).isEqualTo(0); + assertThat(actual).hasSize(0); this.registry.registerSubscription(subscribeMessage(sessId, subsId, null)); actual = this.registry.findSubscriptions(createMessage(dest)); assertThat(actual).isNotNull(); - assertThat(actual.size()).isEqualTo(0); + assertThat(actual).hasSize(0); } @Test @@ -92,7 +92,7 @@ public class DefaultSubscriptionRegistryTests { MultiValueMap actual = this.registry.findSubscriptions(createMessage(dest)); assertThat(actual).isNotNull(); - assertThat(actual.size()).isEqualTo(1); + assertThat(actual).hasSize(1); assertThat(sort(actual.get(sessId))).isEqualTo(subscriptionIds); } @@ -107,7 +107,7 @@ public class DefaultSubscriptionRegistryTests { MultiValueMap actual = this.registry.findSubscriptions(createMessage(dest)); assertThat(actual).isNotNull(); - assertThat(actual.size()).isEqualTo(1); + assertThat(actual).hasSize(1); assertThat(actual.get(sessId)).containsExactly(subId); } @@ -125,7 +125,7 @@ public class DefaultSubscriptionRegistryTests { MultiValueMap actual = this.registry.findSubscriptions(createMessage(dest)); assertThat(actual).isNotNull(); - assertThat(actual.size()).isEqualTo(3); + assertThat(actual).hasSize(3); assertThat(sort(actual.get(sessIds.get(0)))).isEqualTo(subscriptionIds); assertThat(sort(actual.get(sessIds.get(1)))).isEqualTo(subscriptionIds); assertThat(sort(actual.get(sessIds.get(2)))).isEqualTo(subscriptionIds); @@ -162,7 +162,7 @@ public class DefaultSubscriptionRegistryTests { MultiValueMap actual = this.registry.findSubscriptions(destNasdaqIbmMessage); assertThat(actual).isNotNull(); - assertThat(actual.size()).isEqualTo(1); + assertThat(actual).hasSize(1); assertThat(actual.get(sess1)).containsExactlyInAnyOrder(subs2, subs1); this.registry.registerSubscription(subscribeMessage(sess2, subs1, destNasdaqIbm)); @@ -171,7 +171,7 @@ public class DefaultSubscriptionRegistryTests { actual = this.registry.findSubscriptions(destNasdaqIbmMessage); assertThat(actual).isNotNull(); - assertThat(actual.size()).isEqualTo(2); + assertThat(actual).hasSize(2); assertThat(actual.get(sess1)).containsExactlyInAnyOrder(subs2, subs1); assertThat(actual.get(sess2)).isEqualTo(Collections.singletonList(subs1)); @@ -179,7 +179,7 @@ public class DefaultSubscriptionRegistryTests { actual = this.registry.findSubscriptions(destNasdaqIbmMessage); assertThat(actual).isNotNull(); - assertThat(actual.size()).isEqualTo(1); + assertThat(actual).hasSize(1); assertThat(actual.get(sess2)).isEqualTo(Collections.singletonList(subs1)); this.registry.registerSubscription(subscribeMessage(sess1, subs1, "/topic/PRICE.STOCK.*.IBM")); @@ -187,7 +187,7 @@ public class DefaultSubscriptionRegistryTests { actual = this.registry.findSubscriptions(destNasdaqIbmMessage); assertThat(actual).isNotNull(); - assertThat(actual.size()).isEqualTo(2); + assertThat(actual).hasSize(2); assertThat(actual.get(sess1)).containsExactlyInAnyOrder(subs1, subs2); assertThat(actual.get(sess2)).isEqualTo(Collections.singletonList(subs1)); @@ -195,7 +195,7 @@ public class DefaultSubscriptionRegistryTests { actual = this.registry.findSubscriptions(destNasdaqIbmMessage); assertThat(actual).isNotNull(); - assertThat(actual.size()).isEqualTo(2); + assertThat(actual).hasSize(2); assertThat(actual.get(sess1)).isEqualTo(Collections.singletonList(subs1)); assertThat(actual.get(sess2)).isEqualTo(Collections.singletonList(subs1)); @@ -203,14 +203,14 @@ public class DefaultSubscriptionRegistryTests { actual = this.registry.findSubscriptions(destNasdaqIbmMessage); assertThat(actual).isNotNull(); - assertThat(actual.size()).isEqualTo(1); + assertThat(actual).hasSize(1); assertThat(actual.get(sess2)).isEqualTo(Collections.singletonList(subs1)); this.registry.unregisterSubscription(unsubscribeMessage(sess2, subs1)); actual = this.registry.findSubscriptions(destNasdaqIbmMessage); assertThat(actual).isNotNull(); - assertThat(actual.size()).isEqualTo(0); + assertThat(actual).hasSize(0); } @Test // SPR-11755 @@ -289,14 +289,14 @@ public class DefaultSubscriptionRegistryTests { MultiValueMap actual = this.registry.findSubscriptions(message); assertThat(actual).isNotNull(); - assertThat(actual.size()).isEqualTo(1); + assertThat(actual).hasSize(1); assertThat(actual.get(sessionId)).isEqualTo(Collections.singletonList(subscriptionId)); // Then without actual = this.registry.findSubscriptions(createMessage(destination)); assertThat(actual).isNotNull(); - assertThat(actual.size()).isEqualTo(0); + assertThat(actual).hasSize(0); } @Test @@ -316,7 +316,7 @@ public class DefaultSubscriptionRegistryTests { MultiValueMap actual = this.registry.findSubscriptions(message); assertThat(actual).isNotNull(); - assertThat(actual.size()).isEqualTo(1); + assertThat(actual).hasSize(1); assertThat(actual.get(sessionId)).isEqualTo(Collections.singletonList(subscriptionId)); } @@ -408,7 +408,7 @@ public class DefaultSubscriptionRegistryTests { MultiValueMap subscriptions = this.registry.findSubscriptions(createMessage("/foo")); assertThat(subscriptions).isNotNull(); - assertThat(subscriptions.size()).isEqualTo(2); + assertThat(subscriptions).hasSize(2); Iterator>> iterator = subscriptions.entrySet().iterator(); iterator.next(); @@ -426,7 +426,7 @@ public class DefaultSubscriptionRegistryTests { MultiValueMap allSubscriptions = this.registry.findSubscriptions(createMessage("/foo")); assertThat(allSubscriptions).isNotNull(); - assertThat(allSubscriptions.size()).isEqualTo(1); + assertThat(allSubscriptions).hasSize(1); Iterator iteratorValues = allSubscriptions.get("sess1").iterator(); iteratorValues.next(); @@ -443,14 +443,14 @@ public class DefaultSubscriptionRegistryTests { this.registry.registerSubscription(subscribeMessage("sess1", "1", "/foo")); this.registry.registerSubscription(subscribeMessage("sess1", "2", "/bar")); - assertThat(this.registry.findSubscriptions(createMessage("/foo")).size()).isEqualTo(1); - assertThat(this.registry.findSubscriptions(createMessage("/bar")).size()).isEqualTo(1); + assertThat(this.registry.findSubscriptions(createMessage("/foo"))).hasSize(1); + assertThat(this.registry.findSubscriptions(createMessage("/bar"))).hasSize(1); this.registry.registerSubscription(subscribeMessage("sess2", "1", "/foo")); this.registry.registerSubscription(subscribeMessage("sess2", "2", "/bar")); - assertThat(this.registry.findSubscriptions(createMessage("/foo")).size()).isEqualTo(2); - assertThat(this.registry.findSubscriptions(createMessage("/bar")).size()).isEqualTo(2); + assertThat(this.registry.findSubscriptions(createMessage("/foo"))).hasSize(2); + assertThat(this.registry.findSubscriptions(createMessage("/bar"))).hasSize(2); } private Message createMessage(String destination) { diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/broker/SimpleBrokerMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/broker/SimpleBrokerMessageHandlerTests.java index eba17ef3e7f..1e15eeaaf68 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/broker/SimpleBrokerMessageHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/broker/SimpleBrokerMessageHandlerTests.java @@ -230,7 +230,7 @@ public class SimpleBrokerMessageHandlerTests { verify(this.clientOutChannel, atLeast(2)).send(this.messageCaptor.capture()); List> messages = this.messageCaptor.getAllValues(); - assertThat(messages.size()).isEqualTo(2); + assertThat(messages).hasSize(2); MessageHeaders headers = messages.get(0).getHeaders(); assertThat(headers.get(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER)).isEqualTo(SimpMessageType.CONNECT_ACK); @@ -261,7 +261,7 @@ public class SimpleBrokerMessageHandlerTests { verify(this.clientOutChannel, times(2)).send(this.messageCaptor.capture()); List> messages = this.messageCaptor.getAllValues(); - assertThat(messages.size()).isEqualTo(2); + assertThat(messages).hasSize(2); MessageHeaders headers = messages.get(0).getHeaders(); assertThat(headers.get(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER)).isEqualTo(SimpMessageType.CONNECT_ACK); @@ -292,7 +292,7 @@ public class SimpleBrokerMessageHandlerTests { verify(this.clientOutChannel, times(1)).send(this.messageCaptor.capture()); List> messages = this.messageCaptor.getAllValues(); - assertThat(messages.size()).isEqualTo(1); + assertThat(messages).hasSize(1); assertThat(messages.get(0).getHeaders().get(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER)).isEqualTo(SimpMessageType.CONNECT_ACK); } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/config/MessageBrokerConfigurationTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/config/MessageBrokerConfigurationTests.java index 3110f6b9eec..89b7d6d6a07 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/config/MessageBrokerConfigurationTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/config/MessageBrokerConfigurationTests.java @@ -97,7 +97,7 @@ public class MessageBrokerConfigurationTests { TestChannel channel = context.getBean("clientInboundChannel", TestChannel.class); Set handlers = channel.getSubscribers(); - assertThat(handlers.size()).isEqualTo(3); + assertThat(handlers).hasSize(3); assertThat(handlers.contains(context.getBean(SimpAnnotationMethodMessageHandler.class))).isTrue(); assertThat(handlers.contains(context.getBean(UserDestinationMessageHandler.class))).isTrue(); assertThat(handlers.contains(context.getBean(SimpleBrokerMessageHandler.class))).isTrue(); @@ -110,7 +110,7 @@ public class MessageBrokerConfigurationTests { TestChannel channel = context.getBean("clientInboundChannel", TestChannel.class); Set handlers = channel.getSubscribers(); - assertThat(handlers.size()).isEqualTo(3); + assertThat(handlers).hasSize(3); assertThat(handlers.contains(context.getBean(SimpAnnotationMethodMessageHandler.class))).isTrue(); assertThat(handlers.contains(context.getBean(UserDestinationMessageHandler.class))).isTrue(); assertThat(handlers.contains(context.getBean(StompBrokerRelayMessageHandler.class))).isTrue(); @@ -122,7 +122,7 @@ public class MessageBrokerConfigurationTests { AbstractSubscribableChannel channel = context.getBean( "clientInboundChannel", AbstractSubscribableChannel.class); - assertThat(channel.getInterceptors().size()).isEqualTo(3); + assertThat(channel.getInterceptors()).hasSize(3); CustomThreadPoolTaskExecutor taskExecutor = context.getBean( "clientInboundChannelExecutor", CustomThreadPoolTaskExecutor.class); @@ -196,7 +196,7 @@ public class MessageBrokerConfigurationTests { AbstractSubscribableChannel channel = context.getBean( "clientOutboundChannel", AbstractSubscribableChannel.class); - assertThat(channel.getInterceptors().size()).isEqualTo(4); + assertThat(channel.getInterceptors()).hasSize(4); ThreadPoolTaskExecutor taskExecutor = context.getBean( "clientOutboundChannelExecutor", ThreadPoolTaskExecutor.class); @@ -217,7 +217,7 @@ public class MessageBrokerConfigurationTests { TestChannel channel = context.getBean("brokerChannel", TestChannel.class); Set handlers = channel.getSubscribers(); - assertThat(handlers.size()).isEqualTo(2); + assertThat(handlers).hasSize(2); assertThat(handlers.contains(context.getBean(UserDestinationMessageHandler.class))).isTrue(); assertThat(handlers.contains(context.getBean(SimpleBrokerMessageHandler.class))).isTrue(); @@ -231,7 +231,7 @@ public class MessageBrokerConfigurationTests { TestChannel channel = context.getBean("brokerChannel", TestChannel.class); Set handlers = channel.getSubscribers(); - assertThat(handlers.size()).isEqualTo(2); + assertThat(handlers).hasSize(2); assertThat(handlers.contains(context.getBean(UserDestinationMessageHandler.class))).isTrue(); assertThat(handlers.contains(context.getBean(StompBrokerRelayMessageHandler.class))).isTrue(); } @@ -267,7 +267,7 @@ public class MessageBrokerConfigurationTests { AbstractSubscribableChannel channel = context.getBean( "brokerChannel", AbstractSubscribableChannel.class); - assertThat(channel.getInterceptors().size()).isEqualTo(4); + assertThat(channel.getInterceptors()).hasSize(4); ThreadPoolTaskExecutor taskExecutor = context.getBean( "brokerChannelExecutor", ThreadPoolTaskExecutor.class); @@ -359,11 +359,11 @@ public class MessageBrokerConfigurationTests { context.getBean(SimpAnnotationMethodMessageHandler.class); List customResolvers = handler.getCustomArgumentResolvers(); - assertThat(customResolvers.size()).isEqualTo(1); + assertThat(customResolvers).hasSize(1); assertThat(handler.getArgumentResolvers().contains(customResolvers.get(0))).isTrue(); List customHandlers = handler.getCustomReturnValueHandlers(); - assertThat(customHandlers.size()).isEqualTo(1); + assertThat(customHandlers).hasSize(1); assertThat(handler.getReturnValueHandlers().contains(customHandlers.get(0))).isTrue(); } @@ -461,7 +461,7 @@ public class MessageBrokerConfigurationTests { StompBrokerRelayMessageHandler relay = context.getBean(StompBrokerRelayMessageHandler.class); assertThat(relay.getSystemSubscriptions()).isNotNull(); - assertThat(relay.getSystemSubscriptions().size()).isEqualTo(2); + assertThat(relay.getSystemSubscriptions()).hasSize(2); assertThat(relay.getSystemSubscriptions().get("/topic/unresolved-user-destination")).isSameAs(handler1); assertThat(relay.getSystemSubscriptions().get("/topic/simp-user-registry")).isSameAs(handler2); } @@ -517,7 +517,7 @@ public class MessageBrokerConfigurationTests { message = MessageBuilder.createMessage("123".getBytes(), headers.getMessageHeaders()); inChannel.send(message); - assertThat(outChannel.messages.size()).isEqualTo(2); + assertThat(outChannel.messages).hasSize(2); Message outputMessage = outChannel.messages.remove(1); headers = StompHeaderAccessor.wrap(outputMessage); @@ -534,7 +534,7 @@ public class MessageBrokerConfigurationTests { accessor.setSessionId("sess1"); template.convertAndSendToUser("sess1", "queue.q1", "456".getBytes(), accessor.getMessageHeaders()); - assertThat(outChannel.messages.size()).isEqualTo(1); + assertThat(outChannel.messages).hasSize(1); outputMessage = outChannel.messages.remove(0); headers = StompHeaderAccessor.wrap(outputMessage); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/BufferingStompDecoderTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/BufferingStompDecoderTests.java index 80d20b8a24f..0a63ebb9eca 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/BufferingStompDecoderTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/BufferingStompDecoderTests.java @@ -45,7 +45,7 @@ public class BufferingStompDecoderTests { String chunk = "SEND\na:alpha\n\nMessage body\0"; List> messages = stompDecoder.decode(toByteBuffer(chunk)); - assertThat(messages.size()).isEqualTo(1); + assertThat(messages).hasSize(1); assertThat(new String(messages.get(0).getPayload())).isEqualTo("Message body"); assertThat(stompDecoder.getBufferSize()).isEqualTo(0); @@ -62,7 +62,7 @@ public class BufferingStompDecoderTests { assertThat(messages).isEqualTo(Collections.>emptyList()); messages = stompDecoder.decode(toByteBuffer(chunk2)); - assertThat(messages.size()).isEqualTo(1); + assertThat(messages).hasSize(1); assertThat(new String(messages.get(0).getPayload())).isEqualTo("Message body"); assertThat(stompDecoder.getBufferSize()).isEqualTo(0); @@ -75,7 +75,7 @@ public class BufferingStompDecoderTests { String chunk = "SEND\na:alpha\n\nPayload1\0" + "SEND\na:alpha\n\nPayload2\0"; List> messages = stompDecoder.decode(toByteBuffer(chunk)); - assertThat(messages.size()).isEqualTo(2); + assertThat(messages).hasSize(2); assertThat(new String(messages.get(0).getPayload())).isEqualTo("Payload1"); assertThat(new String(messages.get(1).getPayload())).isEqualTo("Payload2"); @@ -90,7 +90,7 @@ public class BufferingStompDecoderTests { String chunk1 = "SEND\na:alpha\n\nPayload1\0SEND\ncontent-length:" + contentLength + "\n"; List> messages = stompDecoder.decode(toByteBuffer(chunk1)); - assertThat(messages.size()).isEqualTo(1); + assertThat(messages).hasSize(1); assertThat(new String(messages.get(0).getPayload())).isEqualTo("Payload1"); assertThat(stompDecoder.getBufferSize()).isEqualTo(23); @@ -99,14 +99,14 @@ public class BufferingStompDecoderTests { String chunk2 = "\nPayload2a"; messages = stompDecoder.decode(toByteBuffer(chunk2)); - assertThat(messages.size()).isEqualTo(0); + assertThat(messages).hasSize(0); assertThat(stompDecoder.getBufferSize()).isEqualTo(33); assertThat((int) stompDecoder.getExpectedContentLength()).isEqualTo(contentLength); String chunk3 = "-Payload2b\0"; messages = stompDecoder.decode(toByteBuffer(chunk3)); - assertThat(messages.size()).isEqualTo(1); + assertThat(messages).hasSize(1); assertThat(new String(messages.get(0).getPayload())).isEqualTo("Payload2a-Payload2b"); assertThat(stompDecoder.getBufferSize()).isEqualTo(0); assertThat(stompDecoder.getExpectedContentLength()).isNull(); @@ -118,7 +118,7 @@ public class BufferingStompDecoderTests { String chunk1 = "SEND\na:alpha\n\nPayload1\0SEND\na:alpha\n"; List> messages = stompDecoder.decode(toByteBuffer(chunk1)); - assertThat(messages.size()).isEqualTo(1); + assertThat(messages).hasSize(1); assertThat(new String(messages.get(0).getPayload())).isEqualTo("Payload1"); assertThat(stompDecoder.getBufferSize()).isEqualTo(13); @@ -127,14 +127,14 @@ public class BufferingStompDecoderTests { String chunk2 = "\nPayload2a"; messages = stompDecoder.decode(toByteBuffer(chunk2)); - assertThat(messages.size()).isEqualTo(0); + assertThat(messages).hasSize(0); assertThat(stompDecoder.getBufferSize()).isEqualTo(23); assertThat(stompDecoder.getExpectedContentLength()).isNull(); String chunk3 = "-Payload2b\0"; messages = stompDecoder.decode(toByteBuffer(chunk3)); - assertThat(messages.size()).isEqualTo(1); + assertThat(messages).hasSize(1); assertThat(new String(messages.get(0).getPayload())).isEqualTo("Payload2a-Payload2b"); assertThat(stompDecoder.getBufferSize()).isEqualTo(0); assertThat(stompDecoder.getExpectedContentLength()).isNull(); @@ -171,7 +171,7 @@ public class BufferingStompDecoderTests { String chunk = "MESSAG"; List> messages = stompDecoder.decode(toByteBuffer(chunk)); - assertThat(messages.size()).isEqualTo(0); + assertThat(messages).hasSize(0); } // SPR-13416 @@ -182,7 +182,7 @@ public class BufferingStompDecoderTests { String chunk = "SEND\na:long\\"; List> messages = stompDecoder.decode(toByteBuffer(chunk)); - assertThat(messages.size()).isEqualTo(0); + assertThat(messages).hasSize(0); } @Test diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/DefaultStompSessionTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/DefaultStompSessionTests.java index d4b0dbc9e69..4f34f2f7532 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/DefaultStompSessionTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/DefaultStompSessionTests.java @@ -597,7 +597,7 @@ public class DefaultStompSessionTests { assertThat(received.get()).isNotNull(); assertThat(received.get()).isTrue(); assertThat(receivedHeaders.get()).isNotNull(); - assertThat(receivedHeaders.get().get("foo").size()).isEqualTo(1); + assertThat(receivedHeaders.get().get("foo")).hasSize(1); assertThat(receivedHeaders.get().get("foo").get(0)).isEqualTo("bar"); } @@ -628,7 +628,7 @@ public class DefaultStompSessionTests { assertThat(received.get()).isNotNull(); assertThat(received.get()).isTrue(); assertThat(receivedHeaders.get()).isNotNull(); - assertThat(receivedHeaders.get().get("foo").size()).isEqualTo(1); + assertThat(receivedHeaders.get().get("foo")).hasSize(1); assertThat(receivedHeaders.get().get("foo").get(0)).isEqualTo("bar"); } @@ -688,7 +688,7 @@ public class DefaultStompSessionTests { StompHeaderAccessor accessor = MessageHeaderAccessor.getAccessor(message, StompHeaderAccessor.class); headers = StompHeaders.readOnlyStompHeaders(accessor.getNativeHeaders()); assertThat(headers.size()).as(headers.toString()).isEqualTo(1); - assertThat(headers.get("foo").size()).isEqualTo(1); + assertThat(headers.get("foo")).hasSize(1); assertThat(headers.get("foo").get(0)).isEqualTo("bar"); assertThat(this.session.isConnected()).isFalse(); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerTests.java index a544d0e6691..f9a7f968c58 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerTests.java @@ -92,7 +92,7 @@ class StompBrokerRelayMessageHandlerTests { this.brokerRelay.start(); this.brokerRelay.handleMessage(connectMessage("sess1", "joe")); - assertThat(this.tcpClient.getSentMessages().size()).isEqualTo(2); + assertThat(this.tcpClient.getSentMessages()).hasSize(2); StompHeaderAccessor headers1 = this.tcpClient.getSentHeaders(0); assertThat(headers1.getCommand()).isEqualTo(StompCommand.CONNECT); @@ -116,7 +116,7 @@ class StompBrokerRelayMessageHandlerTests { this.brokerRelay.start(); this.brokerRelay.handleMessage(connectMessage("sess1", "joe")); - assertThat(this.tcpClient.getSentMessages().size()).isEqualTo(2); + assertThat(this.tcpClient.getSentMessages()).hasSize(2); StompHeaderAccessor headers1 = this.tcpClient.getSentHeaders(0); assertThat(headers1.getCommand()).isEqualTo(StompCommand.CONNECT); @@ -143,7 +143,7 @@ class StompBrokerRelayMessageHandlerTests { accessor.setDestination("/user/daisy/foo"); this.brokerRelay.handleMessage(MessageBuilder.createMessage(new byte[0], accessor.getMessageHeaders())); - assertThat(this.tcpClient.getSentMessages().size()).isEqualTo(2); + assertThat(this.tcpClient.getSentMessages()).hasSize(2); StompHeaderAccessor headers = this.tcpClient.getSentHeaders(0); assertThat(headers.getCommand()).isEqualTo(StompCommand.CONNECT); assertThat(headers.getSessionId()).isEqualTo(StompBrokerRelayMessageHandler.SYSTEM_SESSION_ID); @@ -174,7 +174,7 @@ class StompBrokerRelayMessageHandlerTests { accessor.setDestination("/user/daisy/foo"); this.brokerRelay.handleMessage(MessageBuilder.createMessage(new byte[0], accessor.getMessageHeaders())); - assertThat(this.tcpClient.getSentMessages().size()).isEqualTo(3); + assertThat(this.tcpClient.getSentMessages()).hasSize(3); assertThat(this.tcpClient.getSentHeaders(2).getMessageType()).isEqualTo(SimpMessageType.HEARTBEAT); } @@ -184,7 +184,7 @@ class StompBrokerRelayMessageHandlerTests { this.brokerRelay.start(); this.brokerRelay.handleMessage(connectMessage("sess1", "joe")); - assertThat(this.tcpClient.getSentMessages().size()).isEqualTo(2); + assertThat(this.tcpClient.getSentMessages()).hasSize(2); assertThat(this.tcpClient.getSentHeaders(0).getCommand()).isEqualTo(StompCommand.CONNECT); assertThat(this.tcpClient.getSentHeaders(1).getCommand()).isEqualTo(StompCommand.CONNECT); @@ -247,7 +247,7 @@ class StompBrokerRelayMessageHandlerTests { MessageHeaders headers = accessor.getMessageHeaders(); this.tcpClient.handleMessage(MessageBuilder.createMessage(new byte[0], headers)); - assertThat(this.tcpClient.getSentMessages().size()).isEqualTo(2); + assertThat(this.tcpClient.getSentMessages()).hasSize(2); assertThat(this.tcpClient.getSentHeaders(0).getCommand()).isEqualTo(StompCommand.CONNECT); assertThat(this.tcpClient.getSentHeaders(1).getCommand()).isEqualTo(StompCommand.SUBSCRIBE); assertThat(this.tcpClient.getSentHeaders(1).getDestination()).isEqualTo("/topic/foo"); @@ -268,7 +268,7 @@ class StompBrokerRelayMessageHandlerTests { Message connect = connectMessage("sess1", "joe"); this.brokerRelay.handleMessage(connect); - assertThat(this.tcpClient.getSentMessages().size()).isEqualTo(2); + assertThat(this.tcpClient.getSentMessages()).hasSize(2); StompHeaderAccessor headers1 = this.tcpClient.getSentHeaders(0); assertThat(headers1.getCommand()).isEqualTo(StompCommand.CONNECT); @@ -280,7 +280,7 @@ class StompBrokerRelayMessageHandlerTests { this.brokerRelay.handleMessage(connect); - assertThat(this.tcpClient.getSentMessages().size()).isEqualTo(2); + assertThat(this.tcpClient.getSentMessages()).hasSize(2); assertThat(this.outboundChannel.getMessages()).isEmpty(); } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompDecoderTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompDecoderTests.java index d8cb23d02db..1c28043a0d9 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompDecoderTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompDecoderTests.java @@ -45,7 +45,7 @@ public class StompDecoderTests { StompHeaderAccessor headers = StompHeaderAccessor.wrap(frame); assertThat(headers.getCommand()).isEqualTo(StompCommand.DISCONNECT); - assertThat(headers.toNativeHeaderMap().size()).isEqualTo(0); + assertThat(headers.toNativeHeaderMap()).hasSize(0); assertThat(frame.getPayload().length).isEqualTo(0); } @@ -55,7 +55,7 @@ public class StompDecoderTests { StompHeaderAccessor headers = StompHeaderAccessor.wrap(frame); assertThat(headers.getCommand()).isEqualTo(StompCommand.DISCONNECT); - assertThat(headers.toNativeHeaderMap().size()).isEqualTo(0); + assertThat(headers.toNativeHeaderMap()).hasSize(0); assertThat(frame.getPayload().length).isEqualTo(0); } @@ -69,7 +69,7 @@ public class StompDecoderTests { assertThat(headers.getCommand()).isEqualTo(StompCommand.CONNECT); - assertThat(headers.toNativeHeaderMap().size()).isEqualTo(2); + assertThat(headers.toNativeHeaderMap()).hasSize(2); assertThat(headers.getFirstNativeHeader("accept-version")).isEqualTo("1.1"); assertThat(headers.getHost()).isEqualTo("github.org"); @@ -97,7 +97,7 @@ public class StompDecoderTests { assertThat(headers.getCommand()).isEqualTo(StompCommand.SEND); - assertThat(headers.toNativeHeaderMap().size()).isEqualTo(1); + assertThat(headers.toNativeHeaderMap()).hasSize(1); assertThat(headers.getContentLength()).isEqualTo(Integer.valueOf(23)); String bodyText = new String(message.getPayload()); @@ -113,7 +113,7 @@ public class StompDecoderTests { assertThat(headers.getCommand()).isEqualTo(StompCommand.SEND); - assertThat(headers.toNativeHeaderMap().size()).isEqualTo(1); + assertThat(headers.toNativeHeaderMap()).hasSize(1); assertThat(headers.getContentLength()).isEqualTo(Integer.valueOf(-1)); String bodyText = new String(message.getPayload()); @@ -127,7 +127,7 @@ public class StompDecoderTests { assertThat(headers.getCommand()).isEqualTo(StompCommand.SEND); - assertThat(headers.toNativeHeaderMap().size()).isEqualTo(1); + assertThat(headers.toNativeHeaderMap()).hasSize(1); assertThat(headers.getContentLength()).isEqualTo(Integer.valueOf(0)); String bodyText = new String(frame.getPayload()); @@ -141,7 +141,7 @@ public class StompDecoderTests { assertThat(headers.getCommand()).isEqualTo(StompCommand.SEND); - assertThat(headers.toNativeHeaderMap().size()).isEqualTo(1); + assertThat(headers.toNativeHeaderMap()).hasSize(1); assertThat(headers.getContentLength()).isEqualTo(Integer.valueOf(23)); String bodyText = new String(frame.getPayload()); @@ -155,7 +155,7 @@ public class StompDecoderTests { assertThat(headers.getCommand()).isEqualTo(StompCommand.DISCONNECT); - assertThat(headers.toNativeHeaderMap().size()).isEqualTo(1); + assertThat(headers.toNativeHeaderMap()).hasSize(1); assertThat(headers.getFirstNativeHeader("a:\r\n\\b")).isEqualTo("alpha:bravo\r\n\\"); } @@ -169,7 +169,7 @@ public class StompDecoderTests { assertThat(headers.getCommand()).isEqualTo(StompCommand.CONNECT); - assertThat(headers.toNativeHeaderMap().size()).isEqualTo(2); + assertThat(headers.toNativeHeaderMap()).hasSize(2); assertThat(headers.getFirstNativeHeader("accept-version")).isEqualTo("1.1"); assertThat(headers.getFirstNativeHeader("key")).isEqualTo("\\value"); @@ -189,7 +189,7 @@ public class StompDecoderTests { final List> messages = decoder.decode(buffer); - assertThat(messages.size()).isEqualTo(1); + assertThat(messages).hasSize(1); assertThat(StompHeaderAccessor.wrap(messages.get(0)).getCommand()).isEqualTo(StompCommand.SEND); } @@ -201,7 +201,7 @@ public class StompDecoderTests { final List> messages = decoder.decode(buffer); - assertThat(messages.size()).isEqualTo(2); + assertThat(messages).hasSize(2); assertThat(StompHeaderAccessor.wrap(messages.get(0)).getCommand()).isEqualTo(StompCommand.SEND); assertThat(StompHeaderAccessor.wrap(messages.get(1)).getCommand()).isEqualTo(StompCommand.DISCONNECT); } @@ -216,7 +216,7 @@ public class StompDecoderTests { assertThat(headers.getCommand()).isEqualTo(StompCommand.CONNECT); - assertThat(headers.toNativeHeaderMap().size()).isEqualTo(2); + assertThat(headers.toNativeHeaderMap()).hasSize(2); assertThat(headers.getFirstNativeHeader("accept-version")).isEqualTo("1.1"); assertThat(headers.getFirstNativeHeader("key")).isEqualTo(""); @@ -272,7 +272,7 @@ public class StompDecoderTests { final List> messages = decoder.decode(buffer); - assertThat(messages.size()).isEqualTo(1); + assertThat(messages).hasSize(1); assertThat(StompHeaderAccessor.wrap(messages.get(0)).getMessageType()).isEqualTo(SimpMessageType.HEARTBEAT); } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompHeaderAccessorTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompHeaderAccessorTests.java index c004e675ea1..4aff9449c3b 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompHeaderAccessorTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompHeaderAccessorTests.java @@ -123,7 +123,7 @@ public class StompHeaderAccessorTests { Map> actual = headers.toNativeHeaderMap(); - assertThat(actual.size()).isEqualTo(2); + assertThat(actual).hasSize(2); assertThat(actual.get(StompHeaderAccessor.STOMP_ID_HEADER).get(0)).isEqualTo("s1"); assertThat(actual.get(StompHeaderAccessor.STOMP_DESTINATION_HEADER).get(0)).isEqualTo("/d"); } @@ -135,7 +135,7 @@ public class StompHeaderAccessorTests { Map> actual = headers.toNativeHeaderMap(); - assertThat(actual.size()).isEqualTo(1); + assertThat(actual).hasSize(1); assertThat(actual.get(StompHeaderAccessor.STOMP_ID_HEADER).get(0)).isEqualTo("s1"); } @@ -193,7 +193,7 @@ public class StompHeaderAccessorTests { headers.setNativeHeader("accountId", accountId.toLowerCase()); Map> actual = headers.toNativeHeaderMap(); - assertThat(actual.size()).isEqualTo(3); + assertThat(actual).hasSize(3); assertThat(actual.get(StompHeaderAccessor.STOMP_ID_HEADER).get(0)).isEqualTo("s1"); assertThat(actual.get(StompHeaderAccessor.STOMP_DESTINATION_HEADER).get(0)).isEqualTo("/d"); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolverTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolverTests.java index 020aa2b1bdc..b1b8549b605 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolverTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolverTests.java @@ -66,7 +66,7 @@ public class DefaultUserDestinationResolverTests { UserDestinationResult actual = this.resolver.resolveDestination(message); assertThat(actual.getSourceDestination()).isEqualTo(sourceDestination); - assertThat(actual.getTargetDestinations().size()).isEqualTo(1); + assertThat(actual.getTargetDestinations()).hasSize(1); assertThat(actual.getTargetDestinations().iterator().next()).isEqualTo("/queue/foo-user123"); assertThat(actual.getSubscribeDestination()).isEqualTo(sourceDestination); assertThat(actual.getUser()).isEqualTo(user.getName()); @@ -81,7 +81,7 @@ public class DefaultUserDestinationResolverTests { Message message = createMessage(SimpMessageType.SUBSCRIBE, user, "123", destination); UserDestinationResult actual = this.resolver.resolveDestination(message); - assertThat(actual.getTargetDestinations().size()).isEqualTo(1); + assertThat(actual.getTargetDestinations()).hasSize(1); assertThat(actual.getTargetDestinations().iterator().next()).isEqualTo("jms.queue.call-user123"); assertThat(actual.getSubscribeDestination()).isEqualTo(destination); } @@ -97,7 +97,7 @@ public class DefaultUserDestinationResolverTests { Message message = createMessage(SimpMessageType.SUBSCRIBE, user, "456", "/user/queue/foo"); UserDestinationResult actual = this.resolver.resolveDestination(message); - assertThat(actual.getTargetDestinations().size()).isEqualTo(1); + assertThat(actual.getTargetDestinations()).hasSize(1); assertThat(actual.getTargetDestinations().iterator().next()).isEqualTo("/queue/foo-user456"); } @@ -108,7 +108,7 @@ public class DefaultUserDestinationResolverTests { UserDestinationResult actual = this.resolver.resolveDestination(message); assertThat(actual.getSourceDestination()).isEqualTo(sourceDestination); - assertThat(actual.getTargetDestinations().size()).isEqualTo(1); + assertThat(actual.getTargetDestinations()).hasSize(1); assertThat(actual.getTargetDestinations().iterator().next()).isEqualTo(("/queue/foo-user" + "123")); assertThat(actual.getSubscribeDestination()).isEqualTo(sourceDestination); assertThat(actual.getUser()).isNull(); @@ -129,7 +129,7 @@ public class DefaultUserDestinationResolverTests { Message message = createMessage(SimpMessageType.UNSUBSCRIBE, user, "123", "/user/queue/foo"); UserDestinationResult actual = this.resolver.resolveDestination(message); - assertThat(actual.getTargetDestinations().size()).isEqualTo(1); + assertThat(actual.getTargetDestinations()).hasSize(1); assertThat(actual.getTargetDestinations().iterator().next()).isEqualTo("/queue/foo-user123"); } @@ -141,7 +141,7 @@ public class DefaultUserDestinationResolverTests { UserDestinationResult actual = this.resolver.resolveDestination(message); assertThat(actual.getSourceDestination()).isEqualTo(sourceDestination); - assertThat(actual.getTargetDestinations().size()).isEqualTo(1); + assertThat(actual.getTargetDestinations()).hasSize(1); assertThat(actual.getTargetDestinations().iterator().next()).isEqualTo("/queue/foo-user123"); assertThat(actual.getSubscribeDestination()).isEqualTo("/user/queue/foo"); assertThat(actual.getUser()).isEqualTo(user.getName()); @@ -156,7 +156,7 @@ public class DefaultUserDestinationResolverTests { Message message = createMessage(SimpMessageType.MESSAGE, user, "123", destination); UserDestinationResult actual = this.resolver.resolveDestination(message); - assertThat(actual.getTargetDestinations().size()).isEqualTo(1); + assertThat(actual.getTargetDestinations()).hasSize(1); assertThat(actual.getTargetDestinations().iterator().next()).isEqualTo("jms.queue.call-user123"); assertThat(actual.getSubscribeDestination()).isEqualTo("/user/jms.queue.call"); } @@ -176,7 +176,7 @@ public class DefaultUserDestinationResolverTests { UserDestinationResult actual = this.resolver.resolveDestination(message); assertThat(actual.getSourceDestination()).isEqualTo(sourceDestination); - assertThat(actual.getTargetDestinations().size()).isEqualTo(1); + assertThat(actual.getTargetDestinations()).hasSize(1); assertThat(actual.getTargetDestinations().iterator().next()).isEqualTo("/queue/foo-user456"); assertThat(actual.getSubscribeDestination()).isEqualTo("/user/queue/foo"); assertThat(actual.getUser()).isEqualTo(otherUser.getName()); @@ -195,7 +195,7 @@ public class DefaultUserDestinationResolverTests { Message message = createMessage(SimpMessageType.MESSAGE, new TestPrincipal("joe"), null, destination); UserDestinationResult actual = this.resolver.resolveDestination(message); - assertThat(actual.getTargetDestinations().size()).isEqualTo(1); + assertThat(actual.getTargetDestinations()).hasSize(1); assertThat(actual.getTargetDestinations().iterator().next()).isEqualTo("/queue/foo-useropenid123"); } @@ -206,7 +206,7 @@ public class DefaultUserDestinationResolverTests { UserDestinationResult actual = this.resolver.resolveDestination(message); assertThat(actual.getSourceDestination()).isEqualTo(sourceDestination); - assertThat(actual.getTargetDestinations().size()).isEqualTo(1); + assertThat(actual.getTargetDestinations()).hasSize(1); assertThat(actual.getTargetDestinations().iterator().next()).isEqualTo("/queue/foo-user123"); assertThat(actual.getSubscribeDestination()).isEqualTo("/user/queue/foo"); assertThat(actual.getUser()).isNull(); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/user/MultiServerUserRegistryTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/user/MultiServerUserRegistryTests.java index 553c3af380c..bf04c301b5a 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/user/MultiServerUserRegistryTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/user/MultiServerUserRegistryTests.java @@ -78,12 +78,12 @@ class MultiServerUserRegistryTests { SimpUser user = this.registry.getUser("joe"); assertThat(user).isNotNull(); assertThat(user.hasSessions()).isTrue(); - assertThat(user.getSessions().size()).isEqualTo(1); + assertThat(user.getSessions()).hasSize(1); SimpSession session = user.getSession("remote-sess"); assertThat(session).isNotNull(); assertThat(session.getId()).isEqualTo("remote-sess"); assertThat(session.getUser()).isSameAs(user); - assertThat(session.getSubscriptions().size()).isEqualTo(1); + assertThat(session.getSubscriptions()).hasSize(1); SimpSubscription subscription = session.getSubscriptions().iterator().next(); assertThat(subscription.getId()).isEqualTo("remote-sub"); assertThat(subscription.getSession()).isSameAs(session); @@ -115,7 +115,7 @@ class MultiServerUserRegistryTests { assertThat(this.registry.getUserCount()).isEqualTo(3); Set matches = this.registry.findSubscriptions(s -> s.getDestination().equals("/match")); - assertThat(matches.size()).isEqualTo(2); + assertThat(matches).hasSize(2); Iterator iterator = matches.iterator(); Set sessionIds = new HashSet<>(2); sessionIds.add(iterator.next().getSession().getId()); @@ -147,13 +147,13 @@ class MultiServerUserRegistryTests { assertThat(this.registry.getUserCount()).isEqualTo(1); SimpUser user = this.registry.getUsers().iterator().next(); assertThat(user.hasSessions()).isTrue(); - assertThat(user.getSessions().size()).isEqualTo(2); + assertThat(user.getSessions()).hasSize(2); assertThat(user.getSessions()).containsExactlyInAnyOrder(localSession, remoteSession); assertThat(user.getSession("sess123")).isSameAs(localSession); assertThat(user.getSession("sess456")).isEqualTo(remoteSession); user = this.registry.getUser("joe"); - assertThat(user.getSessions().size()).isEqualTo(2); + assertThat(user.getSessions()).hasSize(2); assertThat(user.getSessions()).containsExactlyInAnyOrder(localSession, remoteSession); assertThat(user.getSession("sess123")).isSameAs(localSession); assertThat(user.getSession("sess456")).isEqualTo(remoteSession); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/support/ChannelInterceptorTests.java b/spring-messaging/src/test/java/org/springframework/messaging/support/ChannelInterceptorTests.java index b72adbcc958..3f5e1b8394f 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/support/ChannelInterceptorTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/support/ChannelInterceptorTests.java @@ -60,7 +60,7 @@ public class ChannelInterceptorTests { this.channel.addInterceptor(interceptor); this.channel.send(MessageBuilder.withPayload("test").build()); - assertThat(this.messageHandler.getMessages().size()).isEqualTo(1); + assertThat(this.messageHandler.getMessages()).hasSize(1); Message result = this.messageHandler.getMessages().get(0); assertThat(result).isNotNull(); @@ -79,7 +79,7 @@ public class ChannelInterceptorTests { assertThat(interceptor1.getCounter().get()).isEqualTo(1); assertThat(interceptor2.getCounter().get()).isEqualTo(1); - assertThat(this.messageHandler.getMessages().size()).isEqualTo(0); + assertThat(this.messageHandler.getMessages()).hasSize(0); assertThat(interceptor1.wasAfterCompletionInvoked()).isTrue(); assertThat(interceptor2.wasAfterCompletionInvoked()).isFalse(); } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/support/MessageHeaderAccessorTests.java b/spring-messaging/src/test/java/org/springframework/messaging/support/MessageHeaderAccessorTests.java index d87a410b028..80bc4bf2fe8 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/support/MessageHeaderAccessorTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/support/MessageHeaderAccessorTests.java @@ -44,7 +44,7 @@ public class MessageHeaderAccessorTests { @Test public void newEmptyHeaders() { MessageHeaderAccessor accessor = new MessageHeaderAccessor(); - assertThat(accessor.toMap().size()).isEqualTo(0); + assertThat(accessor.toMap()).hasSize(0); } @Test @@ -57,7 +57,7 @@ public class MessageHeaderAccessorTests { MessageHeaderAccessor accessor = new MessageHeaderAccessor(message); MessageHeaders actual = accessor.getMessageHeaders(); - assertThat(actual.size()).isEqualTo(3); + assertThat(actual).hasSize(3); assertThat(actual.get("foo")).isEqualTo("bar"); assertThat(actual.get("bar")).isEqualTo("baz"); } @@ -75,7 +75,7 @@ public class MessageHeaderAccessorTests { accessor.setHeader("foo", "BAR"); MessageHeaders actual = accessor.getMessageHeaders(); - assertThat(actual.size()).isEqualTo(3); + assertThat(actual).hasSize(3); assertThat(actual.getId()).isNotEqualTo(message.getHeaders().getId()); assertThat(actual.get("foo")).isEqualTo("BAR"); assertThat(actual.get("bar")).isEqualTo("baz"); @@ -110,7 +110,7 @@ public class MessageHeaderAccessorTests { accessor.removeHeaders("fo*"); MessageHeaders actual = accessor.getMessageHeaders(); - assertThat(actual.size()).isEqualTo(2); + assertThat(actual).hasSize(2); assertThat(actual.get("foo")).isNull(); assertThat(actual.get("bar")).isEqualTo("baz"); } @@ -128,7 +128,7 @@ public class MessageHeaderAccessorTests { accessor.copyHeaders(map2); MessageHeaders actual = accessor.getMessageHeaders(); - assertThat(actual.size()).isEqualTo(3); + assertThat(actual).hasSize(3); assertThat(actual.get("foo")).isEqualTo("BAR"); assertThat(actual.get("bar")).isEqualTo("baz"); } @@ -146,7 +146,7 @@ public class MessageHeaderAccessorTests { accessor.copyHeadersIfAbsent(map2); MessageHeaders actual = accessor.getMessageHeaders(); - assertThat(actual.size()).isEqualTo(3); + assertThat(actual).hasSize(3); assertThat(actual.get("foo")).isEqualTo("bar"); assertThat(actual.get("bar")).isEqualTo("baz"); } @@ -157,7 +157,7 @@ public class MessageHeaderAccessorTests { headers.copyHeaders(null); headers.copyHeadersIfAbsent(null); - assertThat(headers.getMessageHeaders().size()).isEqualTo(1); + assertThat(headers.getMessageHeaders()).hasSize(1); assertThat(headers.getMessageHeaders().keySet()).isEqualTo(Collections.singleton("id")); } @@ -174,9 +174,9 @@ public class MessageHeaderAccessorTests { accessor.setHeader("foo", "bar3"); Map map3 = accessor.toMap(); - assertThat(map1.size()).isEqualTo(1); - assertThat(map2.size()).isEqualTo(1); - assertThat(map3.size()).isEqualTo(1); + assertThat(map1).hasSize(1); + assertThat(map2).hasSize(1); + assertThat(map3).hasSize(1); assertThat(map1.get("foo")).isEqualTo("bar1"); assertThat(map2.get("foo")).isEqualTo("bar2"); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/support/NativeMessageHeaderAccessorTests.java b/spring-messaging/src/test/java/org/springframework/messaging/support/NativeMessageHeaderAccessorTests.java index 73eba06caa4..1dd8aefd9f7 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/support/NativeMessageHeaderAccessorTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/support/NativeMessageHeaderAccessorTests.java @@ -67,7 +67,7 @@ public class NativeMessageHeaderAccessorTests { NativeMessageHeaderAccessor headerAccessor = new NativeMessageHeaderAccessor(message); Map actual = headerAccessor.toMap(); - assertThat(actual.size()).isEqualTo(2); + assertThat(actual).hasSize(2); assertThat(actual.get("a")).isEqualTo("b"); assertThat(actual.get(NativeMessageHeaderAccessor.NATIVE_HEADERS)).isNotNull(); assertThat(actual.get(NativeMessageHeaderAccessor.NATIVE_HEADERS)).isEqualTo(inputNativeHeaders); @@ -79,7 +79,7 @@ public class NativeMessageHeaderAccessorTests { NativeMessageHeaderAccessor headerAccessor = new NativeMessageHeaderAccessor((Message) null); Map actual = headerAccessor.toMap(); - assertThat(actual.size()).isEqualTo(0); + assertThat(actual).hasSize(0); Map> actualNativeHeaders = headerAccessor.toNativeHeaderMap(); assertThat(actualNativeHeaders).isEqualTo(Collections.emptyMap()); @@ -104,7 +104,7 @@ public class NativeMessageHeaderAccessorTests { Map actual = headerAccessor.toMap(); - assertThat(actual.size()).isEqualTo(2); + assertThat(actual).hasSize(2); assertThat(actual.get("a")).isEqualTo("B"); @SuppressWarnings("unchecked") diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java index 13ec9dfe355..16bf248b9a1 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java @@ -149,7 +149,7 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests Query q = sharedEntityManager.createQuery("select p from Person as p"); List people = q.getResultList(); - assertThat(people.size()).isEqualTo(1); + assertThat(people).hasSize(1); assertThat(people.get(0).getFirstName()).isEqualTo(firstName); } @@ -186,7 +186,7 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests EntityManager em = entityManagerFactory.createEntityManager(); Query q = em.createQuery("select p from Person as p"); List people = q.getResultList(); - assertThat(people.size()).isEqualTo(0); + assertThat(people).hasSize(0); assertThatExceptionOfType(NoResultException.class).isThrownBy(q::getSingleResult); } @@ -198,7 +198,7 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests EntityManager em = entityManagerFactory.createEntityManager(); Query q = em.createQuery("select p from Person as p"); List people = q.getResultList(); - assertThat(people.size()).isEqualTo(0); + assertThat(people).hasSize(0); assertThatExceptionOfType(NoResultException.class).isThrownBy(q::getSingleResult); } @@ -208,7 +208,7 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests Query q = this.sharedEntityManager.createQuery("select p from Person as p"); q.setFlushMode(FlushModeType.AUTO); List people = q.getResultList(); - assertThat(people.size()).isEqualTo(0); + assertThat(people).hasSize(0); assertThatExceptionOfType(NoResultException.class).isThrownBy(q::getSingleResult); } @@ -221,7 +221,7 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests Query q = em.createQuery("select p from Person as p"); q.setFlushMode(FlushModeType.AUTO); List people = q.getResultList(); - assertThat(people.size()).isEqualTo(0); + assertThat(people).hasSize(0); assertThatException() .isThrownBy(q::getSingleResult) .withMessageContaining("closed"); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateNativeEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateNativeEntityManagerFactoryIntegrationTests.java index d83a36d57a9..4d1799180bf 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateNativeEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateNativeEntityManagerFactoryIntegrationTests.java @@ -67,7 +67,7 @@ public class HibernateNativeEntityManagerFactoryIntegrationTests extends Abstrac insertPerson(firstName); List people = sharedEntityManager.createQuery("select p from Person as p").getResultList(); - assertThat(people.size()).isEqualTo(1); + assertThat(people).hasSize(1); assertThat(people.get(0).getFirstName()).isEqualTo(firstName); assertThat(people.get(0).postLoaded).isSameAs(applicationContext); } @@ -80,7 +80,7 @@ public class HibernateNativeEntityManagerFactoryIntegrationTests extends Abstrac Query q = sessionFactory.getCurrentSession().createQuery("select p from Person as p"); List people = q.getResultList(); - assertThat(people.size()).isEqualTo(1); + assertThat(people).hasSize(1); assertThat(people.get(0).getFirstName()).isEqualTo(firstName); assertThat(people.get(0).postLoaded).isSameAs(applicationContext); } diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java index 39007b999bc..32cdfa70e9e 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java @@ -60,7 +60,7 @@ public class PersistenceXmlParsingTests { assertThat(info.length).isEqualTo(1); assertThat(info[0].getPersistenceUnitName()).isEqualTo("OrderManagement"); - assertThat(info[0].getJarFileUrls().size()).isEqualTo(2); + assertThat(info[0].getJarFileUrls()).hasSize(2); assertThat(info[0].getJarFileUrls().get(0)).isEqualTo(new ClassPathResource("order.jar").getURL()); assertThat(info[0].getJarFileUrls().get(1)).isEqualTo(new ClassPathResource("order-supplemental.jar").getURL()); @@ -93,9 +93,9 @@ public class PersistenceXmlParsingTests { assertThat(info[0].getPersistenceUnitName()).isEqualTo("OrderManagement2"); - assertThat(info[0].getMappingFileNames().size()).isEqualTo(1); + assertThat(info[0].getMappingFileNames()).hasSize(1); assertThat(info[0].getMappingFileNames().get(0)).isEqualTo("mappings.xml"); - assertThat(info[0].getProperties().keySet().size()).isEqualTo(0); + assertThat(info[0].getProperties().keySet()).hasSize(0); assertThat(info[0].excludeUnlistedClasses()).as("Exclude unlisted should default false in 1.0.").isFalse(); } @@ -111,11 +111,11 @@ public class PersistenceXmlParsingTests { assertThat(info.length).isEqualTo(1); assertThat(info[0].getPersistenceUnitName()).isEqualTo("OrderManagement3"); - assertThat(info[0].getJarFileUrls().size()).isEqualTo(2); + assertThat(info[0].getJarFileUrls()).hasSize(2); assertThat(info[0].getJarFileUrls().get(0)).isEqualTo(new ClassPathResource("order.jar").getURL()); assertThat(info[0].getJarFileUrls().get(1)).isEqualTo(new ClassPathResource("order-supplemental.jar").getURL()); - assertThat(info[0].getProperties().keySet().size()).isEqualTo(0); + assertThat(info[0].getProperties().keySet()).hasSize(0); assertThat(info[0].getJtaDataSource()).isNull(); assertThat(info[0].getNonJtaDataSource()).isNull(); @@ -137,10 +137,10 @@ public class PersistenceXmlParsingTests { assertThat(info.length).isEqualTo(1); assertThat(info[0].getPersistenceUnitName()).isEqualTo("OrderManagement4"); - assertThat(info[0].getMappingFileNames().size()).isEqualTo(1); + assertThat(info[0].getMappingFileNames()).hasSize(1); assertThat(info[0].getMappingFileNames().get(0)).isEqualTo("order-mappings.xml"); - assertThat(info[0].getManagedClassNames().size()).isEqualTo(3); + assertThat(info[0].getManagedClassNames()).hasSize(3); assertThat(info[0].getManagedClassNames().get(0)).isEqualTo("com.acme.Order"); assertThat(info[0].getManagedClassNames().get(1)).isEqualTo("com.acme.Customer"); assertThat(info[0].getManagedClassNames().get(2)).isEqualTo("com.acme.Item"); @@ -148,7 +148,7 @@ public class PersistenceXmlParsingTests { assertThat(info[0].excludeUnlistedClasses()).as("Exclude unlisted should be true when no value.").isTrue(); assertThat(info[0].getTransactionType()).isSameAs(PersistenceUnitTransactionType.RESOURCE_LOCAL); - assertThat(info[0].getProperties().keySet().size()).isEqualTo(0); + assertThat(info[0].getProperties().keySet()).hasSize(0); builder.clear(); } @@ -164,16 +164,16 @@ public class PersistenceXmlParsingTests { assertThat(info.length).isEqualTo(1); assertThat(info[0].getPersistenceUnitName()).isEqualTo("OrderManagement5"); - assertThat(info[0].getMappingFileNames().size()).isEqualTo(2); + assertThat(info[0].getMappingFileNames()).hasSize(2); assertThat(info[0].getMappingFileNames().get(0)).isEqualTo("order1.xml"); assertThat(info[0].getMappingFileNames().get(1)).isEqualTo("order2.xml"); - assertThat(info[0].getJarFileUrls().size()).isEqualTo(2); + assertThat(info[0].getJarFileUrls()).hasSize(2); assertThat(info[0].getJarFileUrls().get(0)).isEqualTo(new ClassPathResource("order.jar").getURL()); assertThat(info[0].getJarFileUrls().get(1)).isEqualTo(new ClassPathResource("order-supplemental.jar").getURL()); assertThat(info[0].getPersistenceProviderClassName()).isEqualTo("com.acme.AcmePersistence"); - assertThat(info[0].getProperties().keySet().size()).isEqualTo(0); + assertThat(info[0].getProperties().keySet()).hasSize(0); assertThat(info[0].excludeUnlistedClasses()).as("Exclude unlisted should default false in 1.0.").isFalse(); } @@ -200,10 +200,10 @@ public class PersistenceXmlParsingTests { assertThat(pu1.getPersistenceProviderClassName()).isEqualTo("com.acme.AcmePersistence"); - assertThat(pu1.getMappingFileNames().size()).isEqualTo(1); + assertThat(pu1.getMappingFileNames()).hasSize(1); assertThat(pu1.getMappingFileNames().get(0)).isEqualTo("ormap2.xml"); - assertThat(pu1.getJarFileUrls().size()).isEqualTo(1); + assertThat(pu1.getJarFileUrls()).hasSize(1); assertThat(pu1.getJarFileUrls().get(0)).isEqualTo(new ClassPathResource("order.jar").getURL()); assertThat(pu1.excludeUnlistedClasses()).isFalse(); @@ -211,7 +211,7 @@ public class PersistenceXmlParsingTests { assertThat(pu1.getTransactionType()).isSameAs(PersistenceUnitTransactionType.RESOURCE_LOCAL); Properties props = pu1.getProperties(); - assertThat(props.keySet().size()).isEqualTo(2); + assertThat(props.keySet()).hasSize(2); assertThat(props.getProperty("com.acme.persistence.sql-logging")).isEqualTo("on"); assertThat(props.getProperty("foo")).isEqualTo("bar"); @@ -226,7 +226,7 @@ public class PersistenceXmlParsingTests { assertThat(pu2.getTransactionType()).isSameAs(PersistenceUnitTransactionType.JTA); assertThat(pu2.getPersistenceProviderClassName()).isEqualTo("com.acme.AcmePersistence"); - assertThat(pu2.getMappingFileNames().size()).isEqualTo(1); + assertThat(pu2.getMappingFileNames()).hasSize(1); assertThat(pu2.getMappingFileNames().get(0)).isEqualTo("order2.xml"); // the following assertions fail only during coverage runs @@ -249,7 +249,7 @@ public class PersistenceXmlParsingTests { PersistenceUnitInfo[] info = reader.readPersistenceUnitInfos(resource); assertThat(info.length).isEqualTo(1); assertThat(info[0].getPersistenceUnitName()).isEqualTo("pu"); - assertThat(info[0].getProperties().keySet().size()).isEqualTo(0); + assertThat(info[0].getProperties().keySet()).hasSize(0); assertThat(info[0].excludeUnlistedClasses()).as("Exclude unlisted should default false in 1.0.").isFalse(); } diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java index 19c428eae0c..fde9b5ee728 100644 --- a/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java +++ b/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java @@ -271,9 +271,9 @@ class MockHttpServletRequestTests { params.put("key2", "value2"); params.put("key3", new String[] { "value3A", "value3B" }); request.addParameters(params); - assertThat(request.getParameterMap().size()).isEqualTo(3); + assertThat(request.getParameterMap()).hasSize(3); request.removeAllParameters(); - assertThat(request.getParameterMap().size()).isEqualTo(0); + assertThat(request.getParameterMap()).hasSize(0); } @Test diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java index 316c30132f2..d72ead85aaf 100644 --- a/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java +++ b/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java @@ -252,7 +252,7 @@ class MockHttpServletResponseTests { response.addHeader(headerName, "value1"); Collection responseHeaders = response.getHeaderNames(); assertThat(responseHeaders).isNotNull(); - assertThat(responseHeaders.size()).isEqualTo(1); + assertThat(responseHeaders).hasSize(1); assertThat(responseHeaders.iterator().next()).as("HTTP header casing not being preserved").isEqualTo(headerName); } diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockMultipartHttpServletRequestTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockMultipartHttpServletRequestTests.java index 54caba8e8e3..ca91bfb582c 100644 --- a/spring-test/src/test/java/org/springframework/mock/web/MockMultipartHttpServletRequestTests.java +++ b/spring-test/src/test/java/org/springframework/mock/web/MockMultipartHttpServletRequestTests.java @@ -87,14 +87,14 @@ class MockMultipartHttpServletRequestTests { while (fileIter.hasNext()) { fileNames.add(fileIter.next()); } - assertThat(fileNames.size()).isEqualTo(2); + assertThat(fileNames).hasSize(2); assertThat(fileNames.contains("file1")).isTrue(); assertThat(fileNames.contains("file2")).isTrue(); MultipartFile file1 = request.getFile("file1"); MultipartFile file2 = request.getFile("file2"); Map fileMap = request.getFileMap(); List fileMapKeys = new ArrayList<>(fileMap.keySet()); - assertThat(fileMapKeys.size()).isEqualTo(2); + assertThat(fileMapKeys).hasSize(2); assertThat(fileMap.get("file1")).isEqualTo(file1); assertThat(fileMap.get("file2")).isEqualTo(file2); diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockServletContextTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockServletContextTests.java index e9ef2635f8b..1dd50081e13 100644 --- a/spring-test/src/test/java/org/springframework/mock/web/MockServletContextTests.java +++ b/spring-test/src/test/java/org/springframework/mock/web/MockServletContextTests.java @@ -180,7 +180,7 @@ class MockServletContextTests { void getServletRegistrations() { Map servletRegistrations = servletContext.getServletRegistrations(); assertThat(servletRegistrations).isNotNull(); - assertThat(servletRegistrations.size()).isEqualTo(0); + assertThat(servletRegistrations).hasSize(0); } /** @@ -198,7 +198,7 @@ class MockServletContextTests { void getFilterRegistrations() { Map filterRegistrations = servletContext.getFilterRegistrations(); assertThat(filterRegistrations).isNotNull(); - assertThat(filterRegistrations.size()).isEqualTo(0); + assertThat(filterRegistrations).hasSize(0); } } diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/InitializerConfiguredViaMetaAnnotationTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/InitializerConfiguredViaMetaAnnotationTests.java index 1be693f8871..0d8dfb7b8ac 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/InitializerConfiguredViaMetaAnnotationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/InitializerConfiguredViaMetaAnnotationTests.java @@ -67,7 +67,7 @@ public class InitializerConfiguredViaMetaAnnotationTests { @Test public void beansFromInitializerAndComposedAnnotation() { - assertThat(strings.size()).isEqualTo(2); + assertThat(strings).hasSize(2); assertThat(foo).isEqualTo("foo"); assertThat(bar).isEqualTo("bar"); } diff --git a/spring-test/src/test/java/org/springframework/test/context/support/ContextLoaderUtilsConfigurationAttributesTests.java b/spring-test/src/test/java/org/springframework/test/context/support/ContextLoaderUtilsConfigurationAttributesTests.java index 6420c1aaa70..bab01250ee0 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/ContextLoaderUtilsConfigurationAttributesTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/ContextLoaderUtilsConfigurationAttributesTests.java @@ -72,7 +72,7 @@ class ContextLoaderUtilsConfigurationAttributesTests extends AbstractContextConf Class testClass = BareAnnotations.class; List attributesList = resolveContextConfigurationAttributes(testClass); assertThat(attributesList).isNotNull(); - assertThat(attributesList.size()).isEqualTo(1); + assertThat(attributesList).hasSize(1); assertAttributes(attributesList.get(0), testClass, EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, ContextLoader.class, true); } @@ -81,7 +81,7 @@ class ContextLoaderUtilsConfigurationAttributesTests extends AbstractContextConf void resolveConfigAttributesWithLocalAnnotationAndLocations() { List attributesList = resolveContextConfigurationAttributes(LocationsFoo.class); assertThat(attributesList).isNotNull(); - assertThat(attributesList.size()).isEqualTo(1); + assertThat(attributesList).hasSize(1); assertLocationsFooAttributes(attributesList.get(0)); } @@ -90,7 +90,7 @@ class ContextLoaderUtilsConfigurationAttributesTests extends AbstractContextConf Class testClass = MetaLocationsFoo.class; List attributesList = resolveContextConfigurationAttributes(testClass); assertThat(attributesList).isNotNull(); - assertThat(attributesList.size()).isEqualTo(1); + assertThat(attributesList).hasSize(1); assertAttributes(attributesList.get(0), testClass, new String[] {"/foo.xml"}, EMPTY_CLASS_ARRAY, ContextLoader.class, true); } @@ -100,7 +100,7 @@ class ContextLoaderUtilsConfigurationAttributesTests extends AbstractContextConf Class testClass = MetaLocationsFooWithOverrides.class; List attributesList = resolveContextConfigurationAttributes(testClass); assertThat(attributesList).isNotNull(); - assertThat(attributesList.size()).isEqualTo(1); + assertThat(attributesList).hasSize(1); assertAttributes(attributesList.get(0), testClass, new String[] {"/foo.xml"}, EMPTY_CLASS_ARRAY, ContextLoader.class, true); } @@ -110,7 +110,7 @@ class ContextLoaderUtilsConfigurationAttributesTests extends AbstractContextConf Class testClass = MetaLocationsFooWithOverriddenAttributes.class; List attributesList = resolveContextConfigurationAttributes(testClass); assertThat(attributesList).isNotNull(); - assertThat(attributesList.size()).isEqualTo(1); + assertThat(attributesList).hasSize(1); assertAttributes(attributesList.get(0), testClass, new String[] {"foo1.xml", "foo2.xml"}, EMPTY_CLASS_ARRAY, ContextLoader.class, true); } @@ -120,7 +120,7 @@ class ContextLoaderUtilsConfigurationAttributesTests extends AbstractContextConf Class testClass = MetaLocationsBar.class; List attributesList = resolveContextConfigurationAttributes(testClass); assertThat(attributesList).isNotNull(); - assertThat(attributesList.size()).isEqualTo(2); + assertThat(attributesList).hasSize(2); assertAttributes(attributesList.get(0), testClass, new String[] {"/bar.xml"}, EMPTY_CLASS_ARRAY, ContextLoader.class, true); assertAttributes(attributesList.get(1), @@ -131,7 +131,7 @@ class ContextLoaderUtilsConfigurationAttributesTests extends AbstractContextConf void resolveConfigAttributesWithLocalAnnotationAndClasses() { List attributesList = resolveContextConfigurationAttributes(ClassesFoo.class); assertThat(attributesList).isNotNull(); - assertThat(attributesList.size()).isEqualTo(1); + assertThat(attributesList).hasSize(1); assertClassesFooAttributes(attributesList.get(0)); } @@ -139,7 +139,7 @@ class ContextLoaderUtilsConfigurationAttributesTests extends AbstractContextConf void resolveConfigAttributesWithLocalAndInheritedAnnotationsAndLocations() { List attributesList = resolveContextConfigurationAttributes(LocationsBar.class); assertThat(attributesList).isNotNull(); - assertThat(attributesList.size()).isEqualTo(2); + assertThat(attributesList).hasSize(2); assertLocationsBarAttributes(attributesList.get(0)); assertLocationsFooAttributes(attributesList.get(1)); } @@ -148,7 +148,7 @@ class ContextLoaderUtilsConfigurationAttributesTests extends AbstractContextConf void resolveConfigAttributesWithLocalAndInheritedAnnotationsAndClasses() { List attributesList = resolveContextConfigurationAttributes(ClassesBar.class); assertThat(attributesList).isNotNull(); - assertThat(attributesList.size()).isEqualTo(2); + assertThat(attributesList).hasSize(2); assertClassesBarAttributes(attributesList.get(0)); assertClassesFooAttributes(attributesList.get(1)); } @@ -161,7 +161,7 @@ class ContextLoaderUtilsConfigurationAttributesTests extends AbstractContextConf void resolveConfigAttributesWithLocationsAndClasses() { List attributesList = resolveContextConfigurationAttributes(LocationsAndClasses.class); assertThat(attributesList).isNotNull(); - assertThat(attributesList.size()).isEqualTo(1); + assertThat(attributesList).hasSize(1); } diff --git a/spring-test/src/test/java/org/springframework/test/context/support/ContextLoaderUtilsContextHierarchyTests.java b/spring-test/src/test/java/org/springframework/test/context/support/ContextLoaderUtilsContextHierarchyTests.java index 72188af6c37..febef2a0e96 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/ContextLoaderUtilsContextHierarchyTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/ContextLoaderUtilsContextHierarchyTests.java @@ -67,18 +67,18 @@ class ContextLoaderUtilsContextHierarchyTests extends AbstractContextConfigurati @Test void resolveContextHierarchyAttributesForSingleTestClassWithImplicitSingleLevelContextHierarchy() { List> hierarchyAttributes = resolveContextHierarchyAttributes(BareAnnotations.class); - assertThat(hierarchyAttributes.size()).isEqualTo(1); + assertThat(hierarchyAttributes).hasSize(1); List configAttributesList = hierarchyAttributes.get(0); - assertThat(configAttributesList.size()).isEqualTo(1); + assertThat(configAttributesList).hasSize(1); debugConfigAttributes(configAttributesList); } @Test void resolveContextHierarchyAttributesForSingleTestClassWithSingleLevelContextHierarchy() { List> hierarchyAttributes = resolveContextHierarchyAttributes(SingleTestClassWithSingleLevelContextHierarchy.class); - assertThat(hierarchyAttributes.size()).isEqualTo(1); + assertThat(hierarchyAttributes).hasSize(1); List configAttributesList = hierarchyAttributes.get(0); - assertThat(configAttributesList.size()).isEqualTo(1); + assertThat(configAttributesList).hasSize(1); debugConfigAttributes(configAttributesList); } @@ -86,11 +86,11 @@ class ContextLoaderUtilsContextHierarchyTests extends AbstractContextConfigurati void resolveContextHierarchyAttributesForSingleTestClassWithSingleLevelContextHierarchyFromMetaAnnotation() { Class testClass = SingleTestClassWithSingleLevelContextHierarchyFromMetaAnnotation.class; List> hierarchyAttributes = resolveContextHierarchyAttributes(testClass); - assertThat(hierarchyAttributes.size()).isEqualTo(1); + assertThat(hierarchyAttributes).hasSize(1); List configAttributesList = hierarchyAttributes.get(0); assertThat(configAttributesList).isNotNull(); - assertThat(configAttributesList.size()).isEqualTo(1); + assertThat(configAttributesList).hasSize(1); debugConfigAttributes(configAttributesList); assertAttributes(configAttributesList.get(0), testClass, new String[] { "A.xml" }, EMPTY_CLASS_ARRAY, ContextLoader.class, true); @@ -100,11 +100,11 @@ class ContextLoaderUtilsContextHierarchyTests extends AbstractContextConfigurati void resolveContextHierarchyAttributesForSingleTestClassWithTripleLevelContextHierarchy() { Class testClass = SingleTestClassWithTripleLevelContextHierarchy.class; List> hierarchyAttributes = resolveContextHierarchyAttributes(testClass); - assertThat(hierarchyAttributes.size()).isEqualTo(1); + assertThat(hierarchyAttributes).hasSize(1); List configAttributesList = hierarchyAttributes.get(0); assertThat(configAttributesList).isNotNull(); - assertThat(configAttributesList.size()).isEqualTo(3); + assertThat(configAttributesList).hasSize(3); debugConfigAttributes(configAttributesList); assertAttributes(configAttributesList.get(0), testClass, new String[] { "A.xml" }, EMPTY_CLASS_ARRAY, ContextLoader.class, true); @@ -117,32 +117,32 @@ class ContextLoaderUtilsContextHierarchyTests extends AbstractContextConfigurati @Test void resolveContextHierarchyAttributesForTestClassHierarchyWithSingleLevelContextHierarchies() { List> hierarchyAttributes = resolveContextHierarchyAttributes(TestClass3WithSingleLevelContextHierarchy.class); - assertThat(hierarchyAttributes.size()).isEqualTo(3); + assertThat(hierarchyAttributes).hasSize(3); List configAttributesListClassLevel1 = hierarchyAttributes.get(0); debugConfigAttributes(configAttributesListClassLevel1); - assertThat(configAttributesListClassLevel1.size()).isEqualTo(1); + assertThat(configAttributesListClassLevel1).hasSize(1); assertThat(configAttributesListClassLevel1.get(0).getLocations()[0]).isEqualTo("one.xml"); List configAttributesListClassLevel2 = hierarchyAttributes.get(1); debugConfigAttributes(configAttributesListClassLevel2); - assertThat(configAttributesListClassLevel2.size()).isEqualTo(1); + assertThat(configAttributesListClassLevel2).hasSize(1); assertThat(configAttributesListClassLevel2.get(0).getLocations()).isEqualTo(new String[] { "two-A.xml", "two-B.xml" }); List configAttributesListClassLevel3 = hierarchyAttributes.get(2); debugConfigAttributes(configAttributesListClassLevel3); - assertThat(configAttributesListClassLevel3.size()).isEqualTo(1); + assertThat(configAttributesListClassLevel3).hasSize(1); assertThat(configAttributesListClassLevel3.get(0).getLocations()[0]).isEqualTo("three.xml"); } @Test void resolveContextHierarchyAttributesForTestClassHierarchyWithSingleLevelContextHierarchiesAndMetaAnnotations() { List> hierarchyAttributes = resolveContextHierarchyAttributes(TestClass3WithSingleLevelContextHierarchyFromMetaAnnotation.class); - assertThat(hierarchyAttributes.size()).isEqualTo(3); + assertThat(hierarchyAttributes).hasSize(3); List configAttributesListClassLevel1 = hierarchyAttributes.get(0); debugConfigAttributes(configAttributesListClassLevel1); - assertThat(configAttributesListClassLevel1.size()).isEqualTo(1); + assertThat(configAttributesListClassLevel1).hasSize(1); assertThat(configAttributesListClassLevel1.get(0).getLocations()[0]).isEqualTo("A.xml"); assertAttributes(configAttributesListClassLevel1.get(0), TestClass1WithSingleLevelContextHierarchyFromMetaAnnotation.class, new String[] { "A.xml" }, @@ -150,7 +150,7 @@ class ContextLoaderUtilsContextHierarchyTests extends AbstractContextConfigurati List configAttributesListClassLevel2 = hierarchyAttributes.get(1); debugConfigAttributes(configAttributesListClassLevel2); - assertThat(configAttributesListClassLevel2.size()).isEqualTo(1); + assertThat(configAttributesListClassLevel2).hasSize(1); assertThat(configAttributesListClassLevel2.get(0).getLocations()).isEqualTo(new String[] { "B-one.xml", "B-two.xml" }); assertAttributes(configAttributesListClassLevel2.get(0), TestClass2WithSingleLevelContextHierarchyFromMetaAnnotation.class, @@ -159,7 +159,7 @@ class ContextLoaderUtilsContextHierarchyTests extends AbstractContextConfigurati List configAttributesListClassLevel3 = hierarchyAttributes.get(2); debugConfigAttributes(configAttributesListClassLevel3); - assertThat(configAttributesListClassLevel3.size()).isEqualTo(1); + assertThat(configAttributesListClassLevel3).hasSize(1); assertThat(configAttributesListClassLevel3.get(0).getLocations()[0]).isEqualTo("C.xml"); assertAttributes(configAttributesListClassLevel3.get(0), TestClass3WithSingleLevelContextHierarchyFromMetaAnnotation.class, new String[] { "C.xml" }, @@ -167,17 +167,17 @@ class ContextLoaderUtilsContextHierarchyTests extends AbstractContextConfigurati } private void assertOneTwo(List> hierarchyAttributes) { - assertThat(hierarchyAttributes.size()).isEqualTo(2); + assertThat(hierarchyAttributes).hasSize(2); List configAttributesListClassLevel1 = hierarchyAttributes.get(0); List configAttributesListClassLevel2 = hierarchyAttributes.get(1); debugConfigAttributes(configAttributesListClassLevel1); debugConfigAttributes(configAttributesListClassLevel2); - assertThat(configAttributesListClassLevel1.size()).isEqualTo(1); + assertThat(configAttributesListClassLevel1).hasSize(1); assertThat(configAttributesListClassLevel1.get(0).getLocations()[0]).isEqualTo("one.xml"); - assertThat(configAttributesListClassLevel2.size()).isEqualTo(1); + assertThat(configAttributesListClassLevel2).hasSize(1); assertThat(configAttributesListClassLevel2.get(0).getLocations()[0]).isEqualTo("two.xml"); } @@ -204,23 +204,23 @@ class ContextLoaderUtilsContextHierarchyTests extends AbstractContextConfigurati @Test void resolveContextHierarchyAttributesForTestClassHierarchyWithMultiLevelContextHierarchies() { List> hierarchyAttributes = resolveContextHierarchyAttributes(TestClass3WithMultiLevelContextHierarchy.class); - assertThat(hierarchyAttributes.size()).isEqualTo(3); + assertThat(hierarchyAttributes).hasSize(3); List configAttributesListClassLevel1 = hierarchyAttributes.get(0); debugConfigAttributes(configAttributesListClassLevel1); - assertThat(configAttributesListClassLevel1.size()).isEqualTo(2); + assertThat(configAttributesListClassLevel1).hasSize(2); assertThat(configAttributesListClassLevel1.get(0).getLocations()[0]).isEqualTo("1-A.xml"); assertThat(configAttributesListClassLevel1.get(1).getLocations()[0]).isEqualTo("1-B.xml"); List configAttributesListClassLevel2 = hierarchyAttributes.get(1); debugConfigAttributes(configAttributesListClassLevel2); - assertThat(configAttributesListClassLevel2.size()).isEqualTo(2); + assertThat(configAttributesListClassLevel2).hasSize(2); assertThat(configAttributesListClassLevel2.get(0).getLocations()[0]).isEqualTo("2-A.xml"); assertThat(configAttributesListClassLevel2.get(1).getLocations()[0]).isEqualTo("2-B.xml"); List configAttributesListClassLevel3 = hierarchyAttributes.get(2); debugConfigAttributes(configAttributesListClassLevel3); - assertThat(configAttributesListClassLevel3.size()).isEqualTo(3); + assertThat(configAttributesListClassLevel3).hasSize(3); assertThat(configAttributesListClassLevel3.get(0).getLocations()[0]).isEqualTo("3-A.xml"); assertThat(configAttributesListClassLevel3.get(1).getLocations()[0]).isEqualTo("3-B.xml"); assertThat(configAttributesListClassLevel3.get(2).getLocations()[0]).isEqualTo("3-C.xml"); diff --git a/spring-test/src/test/java/org/springframework/test/context/support/TestPropertySourceUtilsTests.java b/spring-test/src/test/java/org/springframework/test/context/support/TestPropertySourceUtilsTests.java index 7797a2455dc..b24f537bab6 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/TestPropertySourceUtilsTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/TestPropertySourceUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -215,7 +215,7 @@ class TestPropertySourceUtilsTests { MutablePropertySources propertySources = environment.getPropertySources(); propertySources.remove(MockPropertySource.MOCK_PROPERTIES_PROPERTY_SOURCE_NAME); - assertThat(propertySources.size()).isEqualTo(0); + assertThat(propertySources).hasSize(0); String pair = "key = value"; ByteArrayResource resource = new ByteArrayResource(pair.getBytes(), "from inlined property: " + pair); @@ -223,7 +223,7 @@ class TestPropertySourceUtilsTests { given(resourceLoader.getResource(anyString())).willReturn(resource); addPropertiesFilesToEnvironment(environment, resourceLoader, FOO_LOCATIONS); - assertThat(propertySources.size()).isEqualTo(1); + assertThat(propertySources).hasSize(1); assertThat(environment.getProperty("key")).isEqualTo("value"); } @@ -275,10 +275,10 @@ class TestPropertySourceUtilsTests { ConfigurableEnvironment environment = new MockEnvironment(); MutablePropertySources propertySources = environment.getPropertySources(); propertySources.remove(MockPropertySource.MOCK_PROPERTIES_PROPERTY_SOURCE_NAME); - assertThat(propertySources.size()).isEqualTo(0); + assertThat(propertySources).hasSize(0); addInlinedPropertiesToEnvironment(environment, asArray(" ")); - assertThat(propertySources.size()).isEqualTo(1); - assertThat(((Map) propertySources.iterator().next().getSource()).size()).isEqualTo(0); + assertThat(propertySources).hasSize(1); + assertThat(((Map) propertySources.iterator().next().getSource())).hasSize(0); } @Test diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/MockServerTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/MockServerTests.java index 0e87e7e3cc5..f7c924a1743 100644 --- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/MockServerTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/MockServerTests.java @@ -99,17 +99,17 @@ public class MockServerTests { mutatedBuilder.defaultCookie("baz", "qux"); WebTestClient clientFromMutatedBuilder = mutatedBuilder.build(); - client1.mutate().filters(filters -> assertThat(filters.size()).isEqualTo(1)); - client1.mutate().defaultHeaders(headers -> assertThat(headers.size()).isEqualTo(1)); - client1.mutate().defaultCookies(cookies -> assertThat(cookies.size()).isEqualTo(1)); + client1.mutate().filters(filters -> assertThat(filters).hasSize(1)); + client1.mutate().defaultHeaders(headers -> assertThat(headers).hasSize(1)); + client1.mutate().defaultCookies(cookies -> assertThat(cookies).hasSize(1)); - client2.mutate().filters(filters -> assertThat(filters.size()).isEqualTo(2)); - client2.mutate().defaultHeaders(headers -> assertThat(headers.size()).isEqualTo(2)); - client2.mutate().defaultCookies(cookies -> assertThat(cookies.size()).isEqualTo(2)); + client2.mutate().filters(filters -> assertThat(filters).hasSize(2)); + client2.mutate().defaultHeaders(headers -> assertThat(headers).hasSize(2)); + client2.mutate().defaultCookies(cookies -> assertThat(cookies).hasSize(2)); - clientFromMutatedBuilder.mutate().filters(filters -> assertThat(filters.size()).isEqualTo(2)); - clientFromMutatedBuilder.mutate().defaultHeaders(headers -> assertThat(headers.size()).isEqualTo(2)); - clientFromMutatedBuilder.mutate().defaultCookies(cookies -> assertThat(cookies.size()).isEqualTo(2)); + clientFromMutatedBuilder.mutate().filters(filters -> assertThat(filters).hasSize(2)); + clientFromMutatedBuilder.mutate().defaultHeaders(headers -> assertThat(headers).hasSize(2)); + clientFromMutatedBuilder.mutate().defaultCookies(cookies -> assertThat(cookies).hasSize(2)); } @Test // SPR-16124 diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java index cecedb54c46..c4353381043 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java @@ -403,7 +403,7 @@ public class HtmlUnitRequestBuilderTests { MockHttpServletRequest actualRequest = requestBuilder.buildRequest(servletContext); - assertThat(actualRequest.getParameterMap().size()).isEqualTo(1); + assertThat(actualRequest.getParameterMap()).hasSize(1); assertThat(actualRequest.getParameter("name")).isEqualTo(""); } @@ -413,7 +413,7 @@ public class HtmlUnitRequestBuilderTests { MockHttpServletRequest actualRequest = requestBuilder.buildRequest(servletContext); - assertThat(actualRequest.getParameterMap().size()).isEqualTo(1); + assertThat(actualRequest.getParameterMap()).hasSize(1); assertThat(actualRequest.getParameter("name")).isEqualTo(""); } @@ -423,7 +423,7 @@ public class HtmlUnitRequestBuilderTests { MockHttpServletRequest actualRequest = requestBuilder.buildRequest(servletContext); - assertThat(actualRequest.getParameterMap().size()).isEqualTo(1); + assertThat(actualRequest.getParameterMap()).hasSize(1); assertThat(actualRequest.getParameter("name")).isEqualTo(" "); } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockWebResponseBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockWebResponseBuilderTests.java index 9b6a102a2f4..1a40649c09d 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockWebResponseBuilderTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockWebResponseBuilderTests.java @@ -110,7 +110,7 @@ public class MockWebResponseBuilderTests { WebResponse webResponse = this.responseBuilder.build(); List responseHeaders = webResponse.getResponseHeaders(); - assertThat(responseHeaders.size()).isEqualTo(3); + assertThat(responseHeaders).hasSize(3); NameValuePair header = responseHeaders.get(0); assertThat(header.getName()).isEqualTo("Content-Type"); assertThat(header.getValue()).isEqualTo("text/html"); @@ -132,7 +132,7 @@ public class MockWebResponseBuilderTests { WebResponse webResponse = this.responseBuilder.build(); List responseHeaders = webResponse.getResponseHeaders(); - assertThat(responseHeaders.size()).isEqualTo(1); + assertThat(responseHeaders).hasSize(1); NameValuePair header = responseHeaders.get(0); assertThat(header.getName()).isEqualTo("Set-Cookie"); assertThat(header.getValue()).isEqualTo("cookieA=valueA"); diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java index d8e3be59c4c..bf26ac7383b 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java @@ -345,7 +345,7 @@ class MockHttpServletRequestBuilderTests { List accept = Collections.list(request.getHeaders("Accept")); List result = MediaType.parseMediaTypes(accept.get(0)); - assertThat(accept.size()).isEqualTo(1); + assertThat(accept).hasSize(1); assertThat(result.get(0).toString()).isEqualTo("text/html"); assertThat(result.get(1).toString()).isEqualTo("application/xml"); } @@ -366,7 +366,7 @@ class MockHttpServletRequestBuilderTests { List contentTypes = Collections.list(request.getHeaders("Content-Type")); assertThat(contentType).isEqualTo("text/html"); - assertThat(contentTypes.size()).isEqualTo(1); + assertThat(contentTypes).hasSize(1); assertThat(contentTypes.get(0)).isEqualTo("text/html"); } @@ -379,7 +379,7 @@ class MockHttpServletRequestBuilderTests { List contentTypes = Collections.list(request.getHeaders("Content-Type")); assertThat(contentType).isEqualTo("text/html"); - assertThat(contentTypes.size()).isEqualTo(1); + assertThat(contentTypes).hasSize(1); assertThat(contentTypes.get(0)).isEqualTo("text/html"); } @@ -433,7 +433,7 @@ class MockHttpServletRequestBuilderTests { MockHttpServletRequest request = this.builder.buildRequest(this.servletContext); List headers = Collections.list(request.getHeaders("foo")); - assertThat(headers.size()).isEqualTo(2); + assertThat(headers).hasSize(2); assertThat(headers.get(0)).isEqualTo("bar"); assertThat(headers.get(1)).isEqualTo("baz"); } @@ -448,7 +448,7 @@ class MockHttpServletRequestBuilderTests { MockHttpServletRequest request = this.builder.buildRequest(this.servletContext); List headers = Collections.list(request.getHeaders("foo")); - assertThat(headers.size()).isEqualTo(2); + assertThat(headers).hasSize(2); assertThat(headers.get(0)).isEqualTo("bar"); assertThat(headers.get(1)).isEqualTo("baz"); assertThat(request.getHeader("Content-Type")).isEqualTo(MediaType.APPLICATION_JSON.toString()); diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java index ab8912df8cc..9e59bf62009 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java @@ -168,7 +168,7 @@ class PrintingResultHandlerTests { // Manually validate cookie values since maxAge changes... List cookieValues = this.response.getHeaders("Set-Cookie"); - assertThat(cookieValues.size()).isEqualTo(2); + assertThat(cookieValues).hasSize(2); assertThat(cookieValues.get(0)).isEqualTo("cookie=cookieValue"); assertThat(cookieValues.get(1).startsWith( "enigma=42; Path=/crumbs; Domain=.example.com; Max-Age=1234; Expires=")).as("Actual: " + cookieValues.get(1)).isTrue(); diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionNamespaceHandlerTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionNamespaceHandlerTests.java index 3f4814bd9e2..4ebf734d0a9 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionNamespaceHandlerTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionNamespaceHandlerTests.java @@ -107,7 +107,7 @@ public class AnnotationTransactionNamespaceHandlerTests { public void transactionalEventListenerRegisteredProperly() { assertThat(this.context.containsBean(TransactionManagementConfigUtils .TRANSACTIONAL_EVENT_LISTENER_FACTORY_BEAN_NAME)).isTrue(); - assertThat(this.context.getBeansOfType(TransactionalEventListenerFactory.class).size()).isEqualTo(1); + assertThat(this.context.getBeansOfType(TransactionalEventListenerFactory.class)).hasSize(1); } private TransactionalTestBean getTestBean() { diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java index dfb3dae1953..e9b53b81d20 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java @@ -216,7 +216,7 @@ public class EnableTransactionManagementTests { public void transactionalEventListenerRegisteredProperly() { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(EnableTxConfig.class); assertThat(ctx.containsBean(TransactionManagementConfigUtils.TRANSACTIONAL_EVENT_LISTENER_FACTORY_BEAN_NAME)).isTrue(); - assertThat(ctx.getBeansOfType(TransactionalEventListenerFactory.class).size()).isEqualTo(1); + assertThat(ctx.getBeansOfType(TransactionalEventListenerFactory.class)).hasSize(1); ctx.close(); } diff --git a/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java b/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java index f802ac500bb..b699f5772ae 100644 --- a/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java +++ b/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java @@ -588,7 +588,7 @@ public class HttpHeadersTests { // isEmpty() and size() assertThat(keySet.isEmpty()).isFalse(); - assertThat(keySet.size()).isEqualTo(2); + assertThat(keySet).hasSize(2); // contains() assertThat(keySet.contains("Alpha")).as("Alpha should be present").isTrue(); @@ -610,18 +610,18 @@ public class HttpHeadersTests { // remove() assertThat(keySet.remove("Alpha")).isTrue(); - assertThat(keySet.size()).isEqualTo(1); - assertThat(headers.size()).isEqualTo(1); + assertThat(keySet).hasSize(1); + assertThat(headers).hasSize(1); assertThat(keySet.remove("Alpha")).isFalse(); - assertThat(keySet.size()).isEqualTo(1); - assertThat(headers.size()).isEqualTo(1); + assertThat(keySet).hasSize(1); + assertThat(headers).hasSize(1); // clear() keySet.clear(); assertThat(keySet.isEmpty()).isTrue(); - assertThat(keySet.size()).isEqualTo(0); + assertThat(keySet).hasSize(0); assertThat(headers.isEmpty()).isTrue(); - assertThat(headers.size()).isEqualTo(0); + assertThat(headers).hasSize(0); // Unsupported operations assertThatExceptionOfType(UnsupportedOperationException.class) @@ -653,7 +653,7 @@ public class HttpHeadersTests { assertThat(removed).isTrue(); assertThat(headers.keySet().remove("Alpha")).isFalse(); - assertThat(headers.size()).isEqualTo(1); + assertThat(headers).hasSize(1); assertThat(headers.containsKey("Alpha")).as("Alpha should have been removed").isFalse(); assertThat(headers.containsKey("Bravo")).as("Bravo should be present").isTrue(); assertThat(headers.keySet()).containsOnly("Bravo"); diff --git a/spring-web/src/test/java/org/springframework/http/HttpRangeTests.java b/spring-web/src/test/java/org/springframework/http/HttpRangeTests.java index 550b85fd36d..7ccbefeebb7 100644 --- a/spring-web/src/test/java/org/springframework/http/HttpRangeTests.java +++ b/spring-web/src/test/java/org/springframework/http/HttpRangeTests.java @@ -96,7 +96,7 @@ public class HttpRangeTests { @Test public void parseRanges() { List ranges = HttpRange.parseRanges("bytes=0-0,500-,-1"); - assertThat(ranges.size()).isEqualTo(3); + assertThat(ranges).hasSize(3); assertThat(ranges.get(0).getRangeStart(1000)).isEqualTo(0); assertThat(ranges.get(0).getRangeEnd(1000)).isEqualTo(0); assertThat(ranges.get(1).getRangeStart(1000)).isEqualTo(500); @@ -114,7 +114,7 @@ public class HttpRangeTests { atLimit.append(',').append(i).append('-').append(i + 1); } List ranges = HttpRange.parseRanges(atLimit.toString()); - assertThat(ranges.size()).isEqualTo(100); + assertThat(ranges).hasSize(100); // 2. Above limit.. StringBuilder aboveLimit = new StringBuilder("bytes=0-0"); @@ -185,7 +185,7 @@ public class HttpRangeTests { // 1. Below length List belowLengthRanges = HttpRange.parseRanges("bytes=0-1,2-3"); List regions = HttpRange.toResourceRegions(belowLengthRanges, resource); - assertThat(regions.size()).isEqualTo(2); + assertThat(regions).hasSize(2); // 2. At length List atLengthRanges = HttpRange.parseRanges("bytes=0-1,2-4"); diff --git a/spring-web/src/test/java/org/springframework/http/ResponseEntityTests.java b/spring-web/src/test/java/org/springframework/http/ResponseEntityTests.java index 07b5544db57..bbd77218715 100644 --- a/spring-web/src/test/java/org/springframework/http/ResponseEntityTests.java +++ b/spring-web/src/test/java/org/springframework/http/ResponseEntityTests.java @@ -47,7 +47,7 @@ class ResponseEntityTests { assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(responseEntity.getHeaders().containsKey(headerName)).isTrue(); List list = responseEntity.getHeaders().get(headerName); - assertThat(list.size()).isEqualTo(2); + assertThat(list).hasSize(2); assertThat(list.get(0)).isEqualTo(headerValue1); assertThat(list.get(1)).isEqualTo(headerValue2); assertThat((int) responseEntity.getBody()).isEqualTo((int) entity); @@ -221,8 +221,8 @@ class ResponseEntityTests { HttpHeaders responseHeaders = responseEntity.getHeaders(); assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); - assertThat(responseHeaders.size()).isEqualTo(1); - assertThat(responseHeaders.get("X-CustomHeader").size()).isEqualTo(1); + assertThat(responseHeaders).hasSize(1); + assertThat(responseHeaders.get("X-CustomHeader")).hasSize(1); assertThat(responseHeaders.getFirst("X-CustomHeader")).isEqualTo("vale"); } diff --git a/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java index a41cdcea516..017ca334dd5 100644 --- a/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java +++ b/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java @@ -103,7 +103,7 @@ class InterceptingClientHttpRequestFactoryTests { @Override protected ClientHttpResponse executeInternal() throws IOException { List headerValues = getHeaders().get(headerName); - assertThat(headerValues.size()).isEqualTo(2); + assertThat(headerValues).hasSize(2); assertThat(headerValues.get(0)).isEqualTo(headerValue); assertThat(headerValues.get(1)).isEqualTo(otherValue); return responseMock; diff --git a/spring-web/src/test/java/org/springframework/http/client/MultipartBodyBuilderTests.java b/spring-web/src/test/java/org/springframework/http/client/MultipartBodyBuilderTests.java index cadff157596..fd1c8d4261d 100644 --- a/spring-web/src/test/java/org/springframework/http/client/MultipartBodyBuilderTests.java +++ b/spring-web/src/test/java/org/springframework/http/client/MultipartBodyBuilderTests.java @@ -60,7 +60,7 @@ public class MultipartBodyBuilderTests { MultiValueMap> result = builder.build(); - assertThat(result.size()).isEqualTo(5); + assertThat(result).hasSize(5); HttpEntity resultEntity = result.getFirst("key"); assertThat(resultEntity).isNotNull(); assertThat(resultEntity.getBody()).isEqualTo(multipartData); diff --git a/spring-web/src/test/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriterTests.java b/spring-web/src/test/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriterTests.java index 1db06c829e4..0d7e336077c 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriterTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriterTests.java @@ -127,7 +127,7 @@ public class MultipartHttpMessageWriterTests extends AbstractLeakCheckingTests { .block(Duration.ofSeconds(5)); MultiValueMap requestParts = parse(this.response, hints); - assertThat(requestParts.size()).isEqualTo(7); + assertThat(requestParts).hasSize(7); Part part = requestParts.getFirst("name 1"); assertThat(part instanceof FormFieldPart).isTrue(); @@ -135,7 +135,7 @@ public class MultipartHttpMessageWriterTests extends AbstractLeakCheckingTests { assertThat(((FormFieldPart) part).value()).isEqualTo("value 1"); List parts2 = requestParts.get("name 2"); - assertThat(parts2.size()).isEqualTo(2); + assertThat(parts2).hasSize(2); part = parts2.get(0); assertThat(part instanceof FormFieldPart).isTrue(); assertThat(part.name()).isEqualTo("name 2"); @@ -202,7 +202,7 @@ public class MultipartHttpMessageWriterTests extends AbstractLeakCheckingTests { assertThat(contentType.getParameter("charset")).isNull(); MultiValueMap requestParts = parse(this.response, hints); - assertThat(requestParts.size()).isEqualTo(2); + assertThat(requestParts).hasSize(2); assertThat(requestParts.getFirst("name 1").name()).isEqualTo("name 1"); assertThat(requestParts.getFirst("name 2").name()).isEqualTo("name 2"); } @@ -229,7 +229,7 @@ public class MultipartHttpMessageWriterTests extends AbstractLeakCheckingTests { this.writer.write(result, null, MediaType.MULTIPART_FORM_DATA, this.response, hints).block(); MultiValueMap requestParts = parse(this.response, hints); - assertThat(requestParts.size()).isEqualTo(1); + assertThat(requestParts).hasSize(1); Part part = requestParts.getFirst("logo"); assertThat(part.name()).isEqualTo("logo"); @@ -281,7 +281,7 @@ public class MultipartHttpMessageWriterTests extends AbstractLeakCheckingTests { this.response, hints).block(); MultiValueMap requestParts = parse(this.response, hints); - assertThat(requestParts.size()).isEqualTo(2); + assertThat(requestParts).hasSize(2); Part part = requestParts.getFirst("resource"); assertThat(part instanceof FilePart).isTrue(); diff --git a/spring-web/src/test/java/org/springframework/http/codec/multipart/PartEventHttpMessageWriterTests.java b/spring-web/src/test/java/org/springframework/http/codec/multipart/PartEventHttpMessageWriterTests.java index 03666d4d1cc..213e841ff14 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/multipart/PartEventHttpMessageWriterTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/multipart/PartEventHttpMessageWriterTests.java @@ -79,7 +79,7 @@ public class PartEventHttpMessageWriterTests extends AbstractLeakCheckingTests { .block(Duration.ofSeconds(5)); MultiValueMap requestParts = parse(this.response, hints); - assertThat(requestParts.size()).isEqualTo(2); + assertThat(requestParts).hasSize(2); Part part = requestParts.getFirst("text part"); assertThat(part.name()).isEqualTo("text part"); diff --git a/spring-web/src/test/java/org/springframework/http/codec/multipart/PartHttpMessageWriterTests.java b/spring-web/src/test/java/org/springframework/http/codec/multipart/PartHttpMessageWriterTests.java index 6fe88f458b1..cc41dee8b5f 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/multipart/PartHttpMessageWriterTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/multipart/PartHttpMessageWriterTests.java @@ -96,7 +96,7 @@ public class PartHttpMessageWriterTests extends AbstractLeakCheckingTests { .block(Duration.ofSeconds(5)); MultiValueMap requestParts = parse(this.response, hints); - assertThat(requestParts.size()).isEqualTo(2); + assertThat(requestParts).hasSize(2); Part part = requestParts.getFirst("text part"); assertThat(part.name()).isEqualTo("text part"); diff --git a/spring-web/src/test/java/org/springframework/http/codec/support/ClientCodecConfigurerTests.java b/spring-web/src/test/java/org/springframework/http/codec/support/ClientCodecConfigurerTests.java index 9297a77c320..e061ba55f21 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/support/ClientCodecConfigurerTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/support/ClientCodecConfigurerTests.java @@ -92,7 +92,7 @@ public class ClientCodecConfigurerTests { @Test public void defaultReaders() { List> readers = this.configurer.getReaders(); - assertThat(readers.size()).isEqualTo(17); + assertThat(readers).hasSize(17); assertThat(getNextDecoder(readers).getClass()).isEqualTo(ByteArrayDecoder.class); assertThat(getNextDecoder(readers).getClass()).isEqualTo(ByteBufferDecoder.class); assertThat(getNextDecoder(readers).getClass()).isEqualTo(DataBufferDecoder.class); @@ -116,7 +116,7 @@ public class ClientCodecConfigurerTests { @Test public void defaultWriters() { List> writers = this.configurer.getWriters(); - assertThat(writers.size()).isEqualTo(17); + assertThat(writers).hasSize(17); assertThat(getNextEncoder(writers).getClass()).isEqualTo(ByteArrayEncoder.class); assertThat(getNextEncoder(writers).getClass()).isEqualTo(ByteBufferEncoder.class); assertThat(getNextEncoder(writers).getClass()).isEqualTo(DataBufferEncoder.class); @@ -184,7 +184,7 @@ public class ClientCodecConfigurerTests { int size = 99; this.configurer.defaultCodecs().maxInMemorySize(size); List> readers = this.configurer.getReaders(); - assertThat(readers.size()).isEqualTo(17); + assertThat(readers).hasSize(17); assertThat(((ByteArrayDecoder) getNextDecoder(readers)).getMaxInMemorySize()).isEqualTo(size); assertThat(((ByteBufferDecoder) getNextDecoder(readers)).getMaxInMemorySize()).isEqualTo(size); assertThat(((DataBufferDecoder) getNextDecoder(readers)).getMaxInMemorySize()).isEqualTo(size); diff --git a/spring-web/src/test/java/org/springframework/http/codec/support/CodecConfigurerTests.java b/spring-web/src/test/java/org/springframework/http/codec/support/CodecConfigurerTests.java index 432fe15928b..fc3358514f1 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/support/CodecConfigurerTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/support/CodecConfigurerTests.java @@ -87,7 +87,7 @@ class CodecConfigurerTests { @Test void defaultReaders() { List> readers = this.configurer.getReaders(); - assertThat(readers.size()).isEqualTo(16); + assertThat(readers).hasSize(16); assertThat(getNextDecoder(readers).getClass()).isEqualTo(ByteArrayDecoder.class); assertThat(getNextDecoder(readers).getClass()).isEqualTo(ByteBufferDecoder.class); assertThat(getNextDecoder(readers).getClass()).isEqualTo(DataBufferDecoder.class); @@ -109,7 +109,7 @@ class CodecConfigurerTests { @Test void defaultWriters() { List> writers = this.configurer.getWriters(); - assertThat(writers.size()).isEqualTo(15); + assertThat(writers).hasSize(15); assertThat(getNextEncoder(writers).getClass()).isEqualTo(ByteArrayEncoder.class); assertThat(getNextEncoder(writers).getClass()).isEqualTo(ByteBufferEncoder.class); assertThat(getNextEncoder(writers).getClass()).isEqualTo(DataBufferEncoder.class); @@ -149,7 +149,7 @@ class CodecConfigurerTests { List> readers = this.configurer.getReaders(); - assertThat(readers.size()).isEqualTo(20); + assertThat(readers).hasSize(20); assertThat(getNextDecoder(readers)).isSameAs(customDecoder1); assertThat(readers.get(this.index.getAndIncrement())).isSameAs(customReader1); assertThat(getNextDecoder(readers).getClass()).isEqualTo(ByteArrayDecoder.class); @@ -194,7 +194,7 @@ class CodecConfigurerTests { List> writers = this.configurer.getWriters(); - assertThat(writers.size()).isEqualTo(19); + assertThat(writers).hasSize(19); assertThat(getNextEncoder(writers)).isSameAs(customEncoder1); assertThat(writers.get(this.index.getAndIncrement())).isSameAs(customWriter1); assertThat(getNextEncoder(writers).getClass()).isEqualTo(ByteArrayEncoder.class); @@ -240,7 +240,7 @@ class CodecConfigurerTests { List> readers = this.configurer.getReaders(); - assertThat(readers.size()).isEqualTo(4); + assertThat(readers).hasSize(4); assertThat(getNextDecoder(readers)).isSameAs(customDecoder1); assertThat(readers.get(this.index.getAndIncrement())).isSameAs(customReader1); assertThat(getNextDecoder(readers)).isSameAs(customDecoder2); @@ -271,7 +271,7 @@ class CodecConfigurerTests { List> writers = this.configurer.getWriters(); - assertThat(writers.size()).isEqualTo(4); + assertThat(writers).hasSize(4); assertThat(getNextEncoder(writers)).isSameAs(customEncoder1); assertThat(writers.get(this.index.getAndIncrement())).isSameAs(customWriter1); assertThat(getNextEncoder(writers)).isSameAs(customEncoder2); diff --git a/spring-web/src/test/java/org/springframework/http/codec/support/ServerCodecConfigurerTests.java b/spring-web/src/test/java/org/springframework/http/codec/support/ServerCodecConfigurerTests.java index fe648a22161..a7c84bf1382 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/support/ServerCodecConfigurerTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/support/ServerCodecConfigurerTests.java @@ -92,7 +92,7 @@ public class ServerCodecConfigurerTests { @Test public void defaultReaders() { List> readers = this.configurer.getReaders(); - assertThat(readers.size()).isEqualTo(19); + assertThat(readers).hasSize(19); assertThat(getNextDecoder(readers).getClass()).isEqualTo(ByteArrayDecoder.class); assertThat(getNextDecoder(readers).getClass()).isEqualTo(ByteBufferDecoder.class); assertThat(getNextDecoder(readers).getClass()).isEqualTo(DataBufferDecoder.class); @@ -117,7 +117,7 @@ public class ServerCodecConfigurerTests { @Test public void defaultWriters() { List> writers = this.configurer.getWriters(); - assertThat(writers.size()).isEqualTo(17); + assertThat(writers).hasSize(17); assertThat(getNextEncoder(writers).getClass()).isEqualTo(ByteArrayEncoder.class); assertThat(getNextEncoder(writers).getClass()).isEqualTo(ByteBufferEncoder.class); assertThat(getNextEncoder(writers).getClass()).isEqualTo(DataBufferEncoder.class); diff --git a/spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlDecoderTests.java b/spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlDecoderTests.java index 548e2d9c847..0b6cf72288e 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlDecoderTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/xml/Jaxb2XmlDecoderTests.java @@ -99,7 +99,7 @@ public class Jaxb2XmlDecoderTests extends AbstractLeakCheckingTests { StepVerifier.create(result) .consumeNextWith(events -> { - assertThat(events.size()).isEqualTo(8); + assertThat(events).hasSize(8); assertStartElement(events.get(0), "pojo"); assertStartElement(events.get(1), "foo"); assertCharacters(events.get(2), "foofoo"); @@ -121,7 +121,7 @@ public class Jaxb2XmlDecoderTests extends AbstractLeakCheckingTests { StepVerifier.create(result) .consumeNextWith(events -> { - assertThat(events.size()).isEqualTo(8); + assertThat(events).hasSize(8); assertStartElement(events.get(0), "pojo"); assertStartElement(events.get(1), "foo"); assertCharacters(events.get(2), "foo"); @@ -132,7 +132,7 @@ public class Jaxb2XmlDecoderTests extends AbstractLeakCheckingTests { assertEndElement(events.get(7), "pojo"); }) .consumeNextWith(events -> { - assertThat(events.size()).isEqualTo(8); + assertThat(events).hasSize(8); assertStartElement(events.get(0), "pojo"); assertStartElement(events.get(1), "foo"); assertCharacters(events.get(2), "foofoo"); diff --git a/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java index cc03f25e7aa..5dc99e101dc 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java @@ -199,7 +199,7 @@ public class FormHttpMessageConverterTests { fileUpload.setFileItemFactory(new DiskFileItemFactory()); RequestContext requestContext = new MockHttpOutputMessageRequestContext(outputMessage); List items = fileUpload.parseRequest(requestContext); - assertThat(items.size()).isEqualTo(6); + assertThat(items).hasSize(6); FileItem item = items.get(0); assertThat(item.isFormField()).isTrue(); assertThat(item.getFieldName()).isEqualTo("name 1"); @@ -281,7 +281,7 @@ public class FormHttpMessageConverterTests { fileUpload.setFileItemFactory(new DiskFileItemFactory()); RequestContext requestContext = new MockHttpOutputMessageRequestContext(outputMessage); List items = fileUpload.parseRequest(requestContext); - assertThat(items.size()).isEqualTo(6); + assertThat(items).hasSize(6); FileItem item = items.get(0); assertThat(item.isFormField()).isTrue(); assertThat(item.getFieldName()).isEqualTo("name 1"); @@ -341,7 +341,7 @@ public class FormHttpMessageConverterTests { fileUpload.setFileItemFactory(new DiskFileItemFactory()); RequestContext requestContext = new MockHttpOutputMessageRequestContext(outputMessage); List items = fileUpload.parseRequest(requestContext); - assertThat(items.size()).isEqualTo(2); + assertThat(items).hasSize(2); FileItem item = items.get(0); assertThat(item.isFormField()).isTrue(); diff --git a/spring-web/src/test/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverterTests.java index 05e09b3700b..69d85bdc41c 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverterTests.java @@ -78,7 +78,7 @@ public class AtomFeedHttpMessageConverterTests { assertThat(result.getTitle()).isEqualTo("title"); assertThat(result.getSubtitle().getValue()).isEqualTo("subtitle"); List entries = result.getEntries(); - assertThat(entries.size()).isEqualTo(2); + assertThat(entries).hasSize(2); Entry entry1 = (Entry) entries.get(0); assertThat(entry1.getId()).isEqualTo("id1"); diff --git a/spring-web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java index 72dda284efd..9e9d27b5c0a 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java @@ -65,7 +65,7 @@ public class RssChannelHttpMessageConverterTests { assertThat(result.getDescription()).isEqualTo("description"); List items = result.getItems(); - assertThat(items.size()).isEqualTo(2); + assertThat(items).hasSize(2); Item item1 = (Item) items.get(0); assertThat(item1.getTitle()).isEqualTo("title1"); diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/GsonHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/GsonHttpMessageConverterTests.java index 0bbabb216db..495a897bffa 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/json/GsonHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/json/GsonHttpMessageConverterTests.java @@ -189,7 +189,7 @@ public class GsonHttpMessageConverterTests { Type genericType = beansList.getGenericType(); List results = (List) converter.read(genericType, MyBeanListHolder.class, inputMessage); - assertThat(results.size()).isEqualTo(1); + assertThat(results).hasSize(1); MyBean result = results.get(0); assertThat(result.getString()).isEqualTo("Foo"); assertThat(result.getNumber()).isEqualTo(42); @@ -216,7 +216,7 @@ public class GsonHttpMessageConverterTests { inputMessage.getHeaders().setContentType(new MediaType("application", "json")); List results = (List) converter.read(beansList.getType(), null, inputMessage); - assertThat(results.size()).isEqualTo(1); + assertThat(results).hasSize(1); MyBean result = results.get(0); assertThat(result.getString()).isEqualTo("Foo"); assertThat(result.getNumber()).isEqualTo(42); @@ -243,7 +243,7 @@ public class GsonHttpMessageConverterTests { inputMessage.getHeaders().setContentType(new MediaType("application", "json")); List results = (List) converter.read(beansList.getType(), null, inputMessage); - assertThat(results.size()).isEqualTo(1); + assertThat(results).hasSize(1); MyBean result = results.get(0); assertThat(result.getString()).isEqualTo("Foo"); assertThat(result.getNumber()).isEqualTo(42); diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/JsonbHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/JsonbHttpMessageConverterTests.java index c0825f88d2f..f299fb85a4b 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/json/JsonbHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/json/JsonbHttpMessageConverterTests.java @@ -189,7 +189,7 @@ public class JsonbHttpMessageConverterTests { Type genericType = beansList.getGenericType(); List results = (List) converter.read(genericType, MyBeanListHolder.class, inputMessage); - assertThat(results.size()).isEqualTo(1); + assertThat(results).hasSize(1); MyBean result = results.get(0); assertThat(result.getString()).isEqualTo("Foo"); assertThat(result.getNumber()).isEqualTo(42); @@ -215,7 +215,7 @@ public class JsonbHttpMessageConverterTests { inputMessage.getHeaders().setContentType(new MediaType("application", "json")); List results = (List) converter.read(beansList.getType(), null, inputMessage); - assertThat(results.size()).isEqualTo(1); + assertThat(results).hasSize(1); MyBean result = results.get(0); assertThat(result.getString()).isEqualTo("Foo"); assertThat(result.getNumber()).isEqualTo(42); @@ -242,7 +242,7 @@ public class JsonbHttpMessageConverterTests { inputMessage.getHeaders().setContentType(new MediaType("application", "json")); List results = (List) converter.read(beansList.getType(), null, inputMessage); - assertThat(results.size()).isEqualTo(1); + assertThat(results).hasSize(1); MyBean result = results.get(0); assertThat(result.getString()).isEqualTo("Foo"); assertThat(result.getNumber()).isEqualTo(42); diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java index 415f910be1a..453afb51444 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java @@ -268,7 +268,7 @@ public class MappingJackson2HttpMessageConverterTests { inputMessage.getHeaders().setContentType(new MediaType("application", "json")); List results = (List) converter.read(List.class, inputMessage); - assertThat(results.size()).isEqualTo(1); + assertThat(results).hasSize(1); MyBean result = results.get(0); assertThat(result.getString()).isEqualTo("Foo"); assertThat(result.getNumber()).isEqualTo(42); @@ -299,7 +299,7 @@ public class MappingJackson2HttpMessageConverterTests { MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter(); List results = (List) converter.read(beansList.getType(), null, inputMessage); - assertThat(results.size()).isEqualTo(1); + assertThat(results).hasSize(1); MyBean result = results.get(0); assertThat(result.getString()).isEqualTo("Foo"); assertThat(result.getNumber()).isEqualTo(42); @@ -331,7 +331,7 @@ public class MappingJackson2HttpMessageConverterTests { MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter(); List results = (List) converter.read(beansList.getType(), null, inputMessage); - assertThat(results.size()).isEqualTo(1); + assertThat(results).hasSize(1); MyBean result = results.get(0); assertThat(result.getString()).isEqualTo("Foo"); assertThat(result.getNumber()).isEqualTo(42); diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java index b4b06af76db..8c2b6c590f5 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java @@ -145,7 +145,7 @@ public class Jaxb2CollectionHttpMessageConverterTests { try { Collection result = converter.read(rootElementListType, null, inputMessage); - assertThat(result.size()).isEqualTo(1); + assertThat(result).hasSize(1); assertThat(result.iterator().next().external).isEqualTo(""); } catch (HttpMessageNotReadableException ex) { @@ -173,7 +173,7 @@ public class Jaxb2CollectionHttpMessageConverterTests { }; Collection result = c.read(rootElementListType, null, inputMessage); - assertThat(result.size()).isEqualTo(1); + assertThat(result).hasSize(1); assertThat(result.iterator().next().external).isEqualTo("Foo Bar"); } diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/ChannelSendOperatorTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/ChannelSendOperatorTests.java index 3de547ec2f2..dd39d77cf07 100644 --- a/spring-web/src/test/java/org/springframework/http/server/reactive/ChannelSendOperatorTests.java +++ b/spring-web/src/test/java/org/springframework/http/server/reactive/ChannelSendOperatorTests.java @@ -66,7 +66,7 @@ class ChannelSendOperatorTests { assertThat(signal).isNotNull(); assertThat(signal.isOnComplete()).as("Unexpected signal: " + signal).isTrue(); - assertThat(this.writer.items.size()).isEqualTo(0); + assertThat(this.writer.items).hasSize(0); assertThat(this.writer.completed).isTrue(); } @@ -78,7 +78,7 @@ class ChannelSendOperatorTests { assertThat(signal).isNotNull(); assertThat(signal.isOnComplete()).as("Unexpected signal: " + signal).isTrue(); - assertThat(this.writer.items.size()).isEqualTo(1); + assertThat(this.writer.items).hasSize(1); assertThat(this.writer.items.get(0)).isEqualTo("one"); assertThat(this.writer.completed).isTrue(); } @@ -93,7 +93,7 @@ class ChannelSendOperatorTests { assertThat(signal).isNotNull(); assertThat(signal.isOnComplete()).as("Unexpected signal: " + signal).isTrue(); - assertThat(this.writer.items.size()).isEqualTo(3); + assertThat(this.writer.items).hasSize(3); assertThat(this.writer.items.get(0)).isEqualTo("one"); assertThat(this.writer.items.get(1)).isEqualTo("two"); assertThat(this.writer.items.get(2)).isEqualTo("three"); @@ -117,7 +117,7 @@ class ChannelSendOperatorTests { assertThat(signal).isNotNull(); assertThat(signal.getThrowable()).as("Unexpected signal: " + signal).isSameAs(error); - assertThat(this.writer.items.size()).isEqualTo(3); + assertThat(this.writer.items).hasSize(3); assertThat(this.writer.items.get(0)).isEqualTo("1"); assertThat(this.writer.items.get(1)).isEqualTo("2"); assertThat(this.writer.items.get(2)).isEqualTo("3"); diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/CookieIntegrationTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/CookieIntegrationTests.java index 13b29e63d2e..74af7607682 100644 --- a/spring-web/src/test/java/org/springframework/http/server/reactive/CookieIntegrationTests.java +++ b/spring-web/src/test/java/org/springframework/http/server/reactive/CookieIntegrationTests.java @@ -58,18 +58,18 @@ public class CookieIntegrationTests extends AbstractHttpHandlerIntegrationTests RequestEntity.get(url).header("Cookie", header).build(), Void.class); Map> requestCookies = this.cookieHandler.requestCookies; - assertThat(requestCookies.size()).isEqualTo(2); + assertThat(requestCookies).hasSize(2); List list = requestCookies.get("SID"); - assertThat(list.size()).isEqualTo(1); + assertThat(list).hasSize(1); assertThat(list.iterator().next().getValue()).isEqualTo("31d4d96e407aad42"); list = requestCookies.get("lang"); - assertThat(list.size()).isEqualTo(1); + assertThat(list).hasSize(1); assertThat(list.iterator().next().getValue()).isEqualTo("en-US"); List headerValues = response.getHeaders().get("Set-Cookie"); - assertThat(headerValues.size()).isEqualTo(2); + assertThat(headerValues).hasSize(2); List cookie0 = splitCookie(headerValues.get(0)); assertThat(cookie0.remove("SID=31d4d96e407aad42")).as("SID").isTrue(); diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/HeadersAdaptersTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/HeadersAdaptersTests.java index 8f89a6b3bbd..bfd67748e38 100644 --- a/spring-web/src/test/java/org/springframework/http/server/reactive/HeadersAdaptersTests.java +++ b/spring-web/src/test/java/org/springframework/http/server/reactive/HeadersAdaptersTests.java @@ -64,7 +64,7 @@ class HeadersAdaptersTests { void sizeWithMultipleValuesForHeaderShouldCountHeaders(MultiValueMap headers) { headers.add("TestHeader", "first"); headers.add("TestHeader", "second"); - assertThat(headers.size()).isEqualTo(1); + assertThat(headers).hasSize(1); } @ParameterizedHeadersTest @@ -72,7 +72,7 @@ class HeadersAdaptersTests { headers.add("TestHeader", "first"); headers.add("OtherHeader", "test"); headers.add("TestHeader", "second"); - assertThat(headers.keySet().size()).isEqualTo(2); + assertThat(headers.keySet()).hasSize(2); } @ParameterizedHeadersTest @@ -94,7 +94,7 @@ class HeadersAdaptersTests { headers.add("TestHeader", "first"); headers.put("TestHeader", Arrays.asList("override")); assertThat(headers.getFirst("TestHeader")).isEqualTo("override"); - assertThat(headers.get("TestHeader").size()).isEqualTo(1); + assertThat(headers.get("TestHeader")).hasSize(1); } @ParameterizedHeadersTest diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/ListenerWriteProcessorTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/ListenerWriteProcessorTests.java index 4eabd3554db..c93adbd72d6 100644 --- a/spring-web/src/test/java/org/springframework/http/server/reactive/ListenerWriteProcessorTests.java +++ b/spring-web/src/test/java/org/springframework/http/server/reactive/ListenerWriteProcessorTests.java @@ -64,7 +64,7 @@ public class ListenerWriteProcessorTests { this.processor.onError(new IllegalStateException()); assertThat(this.resultSubscriber.getError()).as("Error should flow to result publisher").isNotNull(); - assertThat(this.processor.getDiscardedBuffers().size()).isEqualTo(1); + assertThat(this.processor.getDiscardedBuffers()).hasSize(1); assertThat(this.processor.getDiscardedBuffers().get(0)).isSameAs(buffer); } @@ -80,7 +80,7 @@ public class ListenerWriteProcessorTests { this.processor.onNext(buffer); assertThat(this.resultSubscriber.getError()).as("Error should flow to result publisher").isNotNull(); - assertThat(this.processor.getDiscardedBuffers().size()).isEqualTo(1); + assertThat(this.processor.getDiscardedBuffers()).hasSize(1); assertThat(this.processor.getDiscardedBuffers().get(0)).isSameAs(buffer); } @@ -97,7 +97,7 @@ public class ListenerWriteProcessorTests { this.processor.onNext(buffer2); assertThat(this.resultSubscriber.getError()).as("Error should flow to result publisher").isNotNull(); - assertThat(this.processor.getDiscardedBuffers().size()).isEqualTo(2); + assertThat(this.processor.getDiscardedBuffers()).hasSize(2); assertThat(this.processor.getDiscardedBuffers().get(0)).isSameAs(buffer2); assertThat(this.processor.getDiscardedBuffers().get(1)).isSameAs(buffer1); } diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/MultipartIntegrationTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/MultipartIntegrationTests.java index f41a40b8fd8..9af1a1397dd 100644 --- a/spring-web/src/test/java/org/springframework/http/server/reactive/MultipartIntegrationTests.java +++ b/spring-web/src/test/java/org/springframework/http/server/reactive/MultipartIntegrationTests.java @@ -94,7 +94,7 @@ class MultipartIntegrationTests extends AbstractHttpHandlerIntegrationTests { return exchange .getMultipartData() .doOnNext(parts -> { - assertThat(parts.size()).isEqualTo(2); + assertThat(parts).hasSize(2); assertThat(parts.containsKey("fooPart")).isTrue(); assertFooPart(parts.getFirst("fooPart")); assertThat(parts.containsKey("barPart")).isTrue(); diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpRequestTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpRequestTests.java index d88f32d4119..2d77d3c2137 100644 --- a/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpRequestTests.java +++ b/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpRequestTests.java @@ -53,13 +53,13 @@ public class ServerHttpRequestTests { @Test public void queryParamsNone() throws Exception { MultiValueMap params = createRequest("/path").getQueryParams(); - assertThat(params.size()).isEqualTo(0); + assertThat(params).hasSize(0); } @Test public void queryParams() throws Exception { MultiValueMap params = createRequest("/path?a=A&b=B").getQueryParams(); - assertThat(params.size()).isEqualTo(2); + assertThat(params).hasSize(2); assertThat(params.get("a")).isEqualTo(Collections.singletonList("A")); assertThat(params.get("b")).isEqualTo(Collections.singletonList("B")); } @@ -67,28 +67,28 @@ public class ServerHttpRequestTests { @Test public void queryParamsWithMultipleValues() throws Exception { MultiValueMap params = createRequest("/path?a=1&a=2").getQueryParams(); - assertThat(params.size()).isEqualTo(1); + assertThat(params).hasSize(1); assertThat(params.get("a")).isEqualTo(Arrays.asList("1", "2")); } @Test // SPR-15140 public void queryParamsWithEncodedValue() throws Exception { MultiValueMap params = createRequest("/path?a=%20%2B+%C3%A0").getQueryParams(); - assertThat(params.size()).isEqualTo(1); + assertThat(params).hasSize(1); assertThat(params.get("a")).isEqualTo(Collections.singletonList(" + \u00e0")); } @Test public void queryParamsWithEmptyValue() throws Exception { MultiValueMap params = createRequest("/path?a=").getQueryParams(); - assertThat(params.size()).isEqualTo(1); + assertThat(params).hasSize(1); assertThat(params.get("a")).isEqualTo(Collections.singletonList("")); } @Test public void queryParamsWithNoValue() throws Exception { MultiValueMap params = createRequest("/path?a").getQueryParams(); - assertThat(params.size()).isEqualTo(1); + assertThat(params).hasSize(1); assertThat(params.get("a")).isEqualTo(Collections.singletonList(null)); } diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpResponseTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpResponseTests.java index afb7d42b608..e907e7ca7a8 100644 --- a/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpResponseTests.java +++ b/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpResponseTests.java @@ -67,7 +67,7 @@ class ServerHttpResponseTests { assertThat(response.headersWritten).isTrue(); assertThat(response.cookiesWritten).isTrue(); - assertThat(response.body.size()).isEqualTo(3); + assertThat(response.body).hasSize(3); assertThat(new String(response.body.get(0).toByteBuffer().array(), StandardCharsets.UTF_8)).isEqualTo("a"); assertThat(new String(response.body.get(1).toByteBuffer().array(), StandardCharsets.UTF_8)).isEqualTo("b"); assertThat(new String(response.body.get(2).toByteBuffer().array(), StandardCharsets.UTF_8)).isEqualTo("c"); @@ -83,7 +83,7 @@ class ServerHttpResponseTests { assertThat(response.headersWritten).isTrue(); assertThat(response.cookiesWritten).isTrue(); - assertThat(response.body.size()).isEqualTo(1); + assertThat(response.body).hasSize(1); assertThat(new String(response.body.get(0).toByteBuffer().array(), StandardCharsets.UTF_8)).isEqualTo("foo"); } @@ -138,7 +138,7 @@ class ServerHttpResponseTests { assertThat(response.cookiesWritten).isTrue(); assertThat(response.getCookies().getFirst("ID")).isSameAs(cookie); - assertThat(response.body.size()).isEqualTo(3); + assertThat(response.body).hasSize(3); assertThat(new String(response.body.get(0).toByteBuffer().array(), StandardCharsets.UTF_8)).isEqualTo("a"); assertThat(new String(response.body.get(1).toByteBuffer().array(), StandardCharsets.UTF_8)).isEqualTo("b"); assertThat(new String(response.body.get(2).toByteBuffer().array(), StandardCharsets.UTF_8)).isEqualTo("c"); diff --git a/spring-web/src/test/java/org/springframework/web/accept/HeaderContentNegotiationStrategyTests.java b/spring-web/src/test/java/org/springframework/web/accept/HeaderContentNegotiationStrategyTests.java index 49f945cea1d..f321db20d66 100644 --- a/spring-web/src/test/java/org/springframework/web/accept/HeaderContentNegotiationStrategyTests.java +++ b/spring-web/src/test/java/org/springframework/web/accept/HeaderContentNegotiationStrategyTests.java @@ -49,7 +49,7 @@ public class HeaderContentNegotiationStrategyTests { this.servletRequest.addHeader("Accept", "text/plain; q=0.5, text/html, text/x-dvi; q=0.8, text/x-c"); List mediaTypes = this.strategy.resolveMediaTypes(this.webRequest); - assertThat(mediaTypes.size()).isEqualTo(4); + assertThat(mediaTypes).hasSize(4); assertThat(mediaTypes.get(0).toString()).isEqualTo("text/html"); assertThat(mediaTypes.get(1).toString()).isEqualTo("text/x-c"); assertThat(mediaTypes.get(2).toString()).isEqualTo("text/x-dvi;q=0.8"); @@ -62,7 +62,7 @@ public class HeaderContentNegotiationStrategyTests { this.servletRequest.addHeader("Accept", "text/x-dvi; q=0.8, text/x-c"); List mediaTypes = this.strategy.resolveMediaTypes(this.webRequest); - assertThat(mediaTypes.size()).isEqualTo(4); + assertThat(mediaTypes).hasSize(4); assertThat(mediaTypes.get(0).toString()).isEqualTo("text/html"); assertThat(mediaTypes.get(1).toString()).isEqualTo("text/x-c"); assertThat(mediaTypes.get(2).toString()).isEqualTo("text/x-dvi;q=0.8"); diff --git a/spring-web/src/test/java/org/springframework/web/accept/MappingContentNegotiationStrategyTests.java b/spring-web/src/test/java/org/springframework/web/accept/MappingContentNegotiationStrategyTests.java index f7e7a550455..182db1152f4 100644 --- a/spring-web/src/test/java/org/springframework/web/accept/MappingContentNegotiationStrategyTests.java +++ b/spring-web/src/test/java/org/springframework/web/accept/MappingContentNegotiationStrategyTests.java @@ -42,7 +42,7 @@ public class MappingContentNegotiationStrategyTests { List mediaTypes = strategy.resolveMediaTypes(null); - assertThat(mediaTypes.size()).isEqualTo(1); + assertThat(mediaTypes).hasSize(1); assertThat(mediaTypes.get(0).toString()).isEqualTo("application/json"); } @@ -73,7 +73,7 @@ public class MappingContentNegotiationStrategyTests { List mediaTypes = strategy.resolveMediaTypes(null); - assertThat(mediaTypes.size()).isEqualTo(1); + assertThat(mediaTypes).hasSize(1); assertThat(mediaTypes.get(0).toString()).isEqualTo("application/xml"); } diff --git a/spring-web/src/test/java/org/springframework/web/bind/support/WebExchangeDataBinderTests.java b/spring-web/src/test/java/org/springframework/web/bind/support/WebExchangeDataBinderTests.java index 8eb211f5624..979b1736798 100644 --- a/spring-web/src/test/java/org/springframework/web/bind/support/WebExchangeDataBinderTests.java +++ b/spring-web/src/test/java/org/springframework/web/bind/support/WebExchangeDataBinderTests.java @@ -214,7 +214,7 @@ public class WebExchangeDataBinderTests { assertThat(bean.getSomeList()).isEqualTo(Arrays.asList("123", "abc")); assertThat(bean.getSomeArray()).isEqualTo(new String[] {"dec", "456"}); assertThat(bean.getPart().filename()).isEqualTo("foo.txt"); - assertThat(bean.getSomePartList().size()).isEqualTo(2); + assertThat(bean.getSomePartList()).hasSize(2); assertThat(bean.getSomePartList().get(0).filename()).isEqualTo("foo.txt"); assertThat(bean.getSomePartList().get(1).filename()).isEqualTo("spring.png"); } diff --git a/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderIntegrationTests.java b/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderIntegrationTests.java index f53a7eb494a..b4bfbf1425e 100644 --- a/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderIntegrationTests.java +++ b/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderIntegrationTests.java @@ -125,7 +125,7 @@ class WebRequestDataBinderIntegrationTests { template.postForLocation(baseUrl + "/partlist", parts); assertThat(bean.getPartList()).isNotNull(); - assertThat(bean.getPartList().size()).isEqualTo(parts.get("partList").size()); + assertThat(bean.getPartList()).hasSize(parts.get("partList").size()); } diff --git a/spring-web/src/test/java/org/springframework/web/client/AbstractMockWebServerTests.java b/spring-web/src/test/java/org/springframework/web/client/AbstractMockWebServerTests.java index a141941665c..8275d336a76 100644 --- a/spring-web/src/test/java/org/springframework/web/client/AbstractMockWebServerTests.java +++ b/spring-web/src/test/java/org/springframework/web/client/AbstractMockWebServerTests.java @@ -91,7 +91,7 @@ abstract class AbstractMockWebServerTests { private MockResponse postRequest(RecordedRequest request, String expectedRequestContent, String location, String contentType, byte[] responseBody) { - assertThat(request.getHeaders().values(CONTENT_LENGTH).size()).isEqualTo(1); + assertThat(request.getHeaders().values(CONTENT_LENGTH)).hasSize(1); assertThat(Integer.parseInt(request.getHeader(CONTENT_LENGTH))).as("Invalid request content-length").isGreaterThan(0); String requestContentType = request.getHeader(CONTENT_TYPE); assertThat(requestContentType).as("No content-type").isNotNull(); diff --git a/spring-web/src/test/java/org/springframework/web/context/request/ServletWebRequestTests.java b/spring-web/src/test/java/org/springframework/web/context/request/ServletWebRequestTests.java index 42ab49c5838..e6a4d412af6 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/ServletWebRequestTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/ServletWebRequestTests.java @@ -69,7 +69,7 @@ public class ServletWebRequestTests { assertThat(request.getParameterValues("param2")[1]).isEqualTo("value2a"); Map paramMap = request.getParameterMap(); - assertThat(paramMap.size()).isEqualTo(2); + assertThat(paramMap).hasSize(2); assertThat(paramMap.get("param1").length).isEqualTo(1); assertThat(paramMap.get("param1")[0]).isEqualTo("value1"); assertThat(paramMap.get("param2").length).isEqualTo(2); diff --git a/spring-web/src/test/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequestTests.java b/spring-web/src/test/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequestTests.java index 1d0ddfbe1b0..2dcd2f4136c 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequestTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequestTests.java @@ -68,7 +68,7 @@ public class StandardServletAsyncWebRequestTests { MockAsyncContext context = (MockAsyncContext) this.request.getAsyncContext(); assertThat(context).isNotNull(); assertThat(context.getTimeout()).as("Timeout value not set").isEqualTo((44 * 1000)); - assertThat(context.getListeners().size()).isEqualTo(1); + assertThat(context.getListeners()).hasSize(1); assertThat(context.getListeners().get(0)).isSameAs(this.asyncRequest); } @@ -81,7 +81,7 @@ public class StandardServletAsyncWebRequestTests { MockAsyncContext context = (MockAsyncContext) this.request.getAsyncContext(); assertThat(context).isNotNull(); - assertThat(context.getListeners().size()).isEqualTo(1); + assertThat(context.getListeners()).hasSize(1); } @Test diff --git a/spring-web/src/test/java/org/springframework/web/filter/FormContentFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/FormContentFilterTests.java index 1273628b19f..f294f17a50b 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/FormContentFilterTests.java +++ b/spring-web/src/test/java/org/springframework/web/filter/FormContentFilterTests.java @@ -200,7 +200,7 @@ public class FormContentFilterTests { Map parameters = this.filterChain.getRequest().getParameterMap(); assertThat(this.filterChain.getRequest()).as("Request not wrapped").isNotSameAs(this.request); - assertThat(parameters.size()).isEqualTo(2); + assertThat(parameters).hasSize(2); assertThat(parameters.get("name")).isEqualTo(new String[] {"value1", "value2", "value3"}); assertThat(parameters.get("name4")).isEqualTo(new String[] {"value4"}); } diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/ModelFactoryTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/ModelFactoryTests.java index 1275c08b695..b2c51c0e97e 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/ModelFactoryTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/ModelFactoryTests.java @@ -177,7 +177,7 @@ public class ModelFactoryTests { assertThat(container.getModel().get(commandName)).isEqualTo(command); String bindingResultKey = BindingResult.MODEL_KEY_PREFIX + commandName; assertThat(container.getModel().get(bindingResultKey)).isSameAs(dataBinder.getBindingResult()); - assertThat(container.getModel().size()).isEqualTo(2); + assertThat(container.getModel()).hasSize(2); } @Test @@ -240,7 +240,7 @@ public class ModelFactoryTests { modelFactory.updateModel(this.webRequest, container); assertThat(container.getModel().get(queryParamName)).isEqualTo(queryParam); - assertThat(container.getModel().size()).isEqualTo(1); + assertThat(container.getModel()).hasSize(1); assertThat(this.attributeStore.retrieveAttribute(this.webRequest, attributeName)).isEqualTo(attribute); } diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java index 2c1693a6065..b493da16848 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java @@ -122,7 +122,7 @@ public class RequestParamMapMethodArgumentResolverTests { boolean condition = result instanceof Map; assertThat(condition).isTrue(); Map resultMap = (Map) result; - assertThat(resultMap.size()).isEqualTo(2); + assertThat(resultMap).hasSize(2); assertThat(resultMap.get("mfile")).isEqualTo(expected1); assertThat(resultMap.get("other")).isEqualTo(expected2); } @@ -145,11 +145,11 @@ public class RequestParamMapMethodArgumentResolverTests { boolean condition = result instanceof MultiValueMap; assertThat(condition).isTrue(); MultiValueMap resultMap = (MultiValueMap) result; - assertThat(resultMap.size()).isEqualTo(2); - assertThat(resultMap.get("mfilelist").size()).isEqualTo(2); + assertThat(resultMap).hasSize(2); + assertThat(resultMap.get("mfilelist")).hasSize(2); assertThat(resultMap.get("mfilelist").get(0)).isEqualTo(expected1); assertThat(resultMap.get("mfilelist").get(1)).isEqualTo(expected2); - assertThat(resultMap.get("other").size()).isEqualTo(1); + assertThat(resultMap.get("other")).hasSize(1); assertThat(resultMap.get("other").get(0)).isEqualTo(expected3); } @@ -170,7 +170,7 @@ public class RequestParamMapMethodArgumentResolverTests { boolean condition = result instanceof Map; assertThat(condition).isTrue(); Map resultMap = (Map) result; - assertThat(resultMap.size()).isEqualTo(2); + assertThat(resultMap).hasSize(2); assertThat(resultMap.get("mfile")).isEqualTo(expected1); assertThat(resultMap.get("other")).isEqualTo(expected2); } @@ -194,11 +194,11 @@ public class RequestParamMapMethodArgumentResolverTests { boolean condition = result instanceof MultiValueMap; assertThat(condition).isTrue(); MultiValueMap resultMap = (MultiValueMap) result; - assertThat(resultMap.size()).isEqualTo(2); - assertThat(resultMap.get("mfilelist").size()).isEqualTo(2); + assertThat(resultMap).hasSize(2); + assertThat(resultMap.get("mfilelist")).hasSize(2); assertThat(resultMap.get("mfilelist").get(0)).isEqualTo(expected1); assertThat(resultMap.get("mfilelist").get(1)).isEqualTo(expected2); - assertThat(resultMap.get("other").size()).isEqualTo(1); + assertThat(resultMap.get("other")).hasSize(1); assertThat(resultMap.get("other").get(0)).isEqualTo(expected3); } diff --git a/spring-web/src/test/java/org/springframework/web/method/support/InvocableHandlerMethodTests.java b/spring-web/src/test/java/org/springframework/web/method/support/InvocableHandlerMethodTests.java index e69d363df15..0d743bed602 100644 --- a/spring-web/src/test/java/org/springframework/web/method/support/InvocableHandlerMethodTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/support/InvocableHandlerMethodTests.java @@ -61,8 +61,8 @@ public class InvocableHandlerMethodTests { Object value = getInvocable(Integer.class, String.class).invokeForRequest(request, null); - assertThat(getStubResolver(0).getResolvedParameters().size()).isEqualTo(1); - assertThat(getStubResolver(1).getResolvedParameters().size()).isEqualTo(1); + assertThat(getStubResolver(0).getResolvedParameters()).hasSize(1); + assertThat(getStubResolver(1).getResolvedParameters()).hasSize(1); assertThat(value).isEqualTo("99-value"); assertThat(getStubResolver(0).getResolvedParameters().get(0).getParameterName()).isEqualTo("intArg"); assertThat(getStubResolver(1).getResolvedParameters().get(0).getParameterName()).isEqualTo("stringArg"); @@ -75,8 +75,8 @@ public class InvocableHandlerMethodTests { Object returnValue = getInvocable(Integer.class, String.class).invokeForRequest(request, null); - assertThat(getStubResolver(0).getResolvedParameters().size()).isEqualTo(1); - assertThat(getStubResolver(1).getResolvedParameters().size()).isEqualTo(1); + assertThat(getStubResolver(0).getResolvedParameters()).hasSize(1); + assertThat(getStubResolver(1).getResolvedParameters()).hasSize(1); assertThat(returnValue).isEqualTo("null-null"); } diff --git a/spring-web/src/test/java/org/springframework/web/method/support/ModelAndViewContainerTests.java b/spring-web/src/test/java/org/springframework/web/method/support/ModelAndViewContainerTests.java index ca21a9a092a..aa59ba6244c 100644 --- a/spring-web/src/test/java/org/springframework/web/method/support/ModelAndViewContainerTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/support/ModelAndViewContainerTests.java @@ -43,7 +43,7 @@ public class ModelAndViewContainerTests { @Test public void getModel() { this.mavContainer.addAttribute("name", "value"); - assertThat(this.mavContainer.getModel().size()).isEqualTo(1); + assertThat(this.mavContainer.getModel()).hasSize(1); assertThat(this.mavContainer.getModel().get("name")).isEqualTo("value"); } @@ -53,7 +53,7 @@ public class ModelAndViewContainerTests { this.mavContainer.setRedirectModel(new ModelMap("name2", "value2")); this.mavContainer.setRedirectModelScenario(true); - assertThat(this.mavContainer.getModel().size()).isEqualTo(1); + assertThat(this.mavContainer.getModel()).hasSize(1); assertThat(this.mavContainer.getModel().get("name2")).isEqualTo("value2"); } @@ -64,7 +64,7 @@ public class ModelAndViewContainerTests { this.mavContainer.addAttribute("name", "value"); this.mavContainer.setRedirectModelScenario(true); - assertThat(this.mavContainer.getModel().size()).isEqualTo(1); + assertThat(this.mavContainer.getModel()).hasSize(1); assertThat(this.mavContainer.getModel().get("name")).isEqualTo("value"); } @@ -81,7 +81,7 @@ public class ModelAndViewContainerTests { this.mavContainer.setRedirectModelScenario(true); this.mavContainer.addAttribute("name", "value"); - assertThat(this.mavContainer.getModel().size()).isEqualTo(1); + assertThat(this.mavContainer.getModel()).hasSize(1); assertThat(this.mavContainer.getModel().get("name")).isEqualTo("value"); } diff --git a/spring-web/src/test/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequestTests.java b/spring-web/src/test/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequestTests.java index 62abdfdbea2..8b5e9e728d8 100644 --- a/spring-web/src/test/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequestTests.java +++ b/spring-web/src/test/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequestTests.java @@ -64,7 +64,7 @@ public class DefaultMultipartHttpServletRequestTests { Map map = createMultipartRequest().getParameterMap(); - assertThat(map.size()).isEqualTo(3); + assertThat(map).hasSize(3); assertThat(map.get("key1")).isEqualTo(new String[] {"p1", "q1"}); assertThat(map.get("key2")).isEqualTo(new String[] {"p2"}); assertThat(map.get("key3")).isEqualTo(new String[] {"q3"}); diff --git a/spring-web/src/test/java/org/springframework/web/server/adapter/DefaultServerWebExchangeCheckNotModifiedTests.java b/spring-web/src/test/java/org/springframework/web/server/adapter/DefaultServerWebExchangeCheckNotModifiedTests.java index 2ab3a3a43c9..e65e85837e6 100644 --- a/spring-web/src/test/java/org/springframework/web/server/adapter/DefaultServerWebExchangeCheckNotModifiedTests.java +++ b/spring-web/src/test/java/org/springframework/web/server/adapter/DefaultServerWebExchangeCheckNotModifiedTests.java @@ -80,7 +80,7 @@ class DefaultServerWebExchangeCheckNotModifiedTests { assertThat(exchange.checkNotModified(currentDate)).isTrue(); assertThat(exchange.getResponse().getStatusCode().value()).isEqualTo(304); - assertThat(exchange.getResponse().getHeaders().get("Last-Modified").size()).isEqualTo(1); + assertThat(exchange.getResponse().getHeaders().get("Last-Modified")).hasSize(1); assertThat(exchange.getResponse().getHeaders().getFirst("Last-Modified")).isEqualTo(CURRENT_TIME); } diff --git a/spring-web/src/test/java/org/springframework/web/server/session/CookieWebSessionIdResolverTests.java b/spring-web/src/test/java/org/springframework/web/server/session/CookieWebSessionIdResolverTests.java index 68fdb229cd0..b10d250f004 100644 --- a/spring-web/src/test/java/org/springframework/web/server/session/CookieWebSessionIdResolverTests.java +++ b/spring-web/src/test/java/org/springframework/web/server/session/CookieWebSessionIdResolverTests.java @@ -41,7 +41,7 @@ public class CookieWebSessionIdResolverTests { this.resolver.setSessionId(exchange, "123"); MultiValueMap cookies = exchange.getResponse().getCookies(); - assertThat(cookies.size()).isEqualTo(1); + assertThat(cookies).hasSize(1); ResponseCookie cookie = cookies.getFirst(this.resolver.getCookieName()); assertThat(cookie).isNotNull(); assertThat(cookie.toString()).isEqualTo("SESSION=123; Path=/; Secure; HttpOnly; SameSite=Lax"); @@ -58,7 +58,7 @@ public class CookieWebSessionIdResolverTests { this.resolver.setSessionId(exchange, "123"); MultiValueMap cookies = exchange.getResponse().getCookies(); - assertThat(cookies.size()).isEqualTo(1); + assertThat(cookies).hasSize(1); ResponseCookie cookie = cookies.getFirst(this.resolver.getCookieName()); assertThat(cookie).isNotNull(); assertThat(cookie.toString()).isEqualTo("SESSION=123; Path=/; Domain=example.org; HttpOnly; SameSite=Strict"); diff --git a/spring-web/src/test/java/org/springframework/web/server/session/InMemoryWebSessionStoreTests.java b/spring-web/src/test/java/org/springframework/web/server/session/InMemoryWebSessionStoreTests.java index a1795fc3b58..aa4be84fcd5 100644 --- a/spring-web/src/test/java/org/springframework/web/server/session/InMemoryWebSessionStoreTests.java +++ b/spring-web/src/test/java/org/springframework/web/server/session/InMemoryWebSessionStoreTests.java @@ -138,15 +138,15 @@ public class InMemoryWebSessionStoreTests { // Create 100 sessions IntStream.range(0, 100).forEach(i -> insertSession()); - assertThat(sessions.size()).isEqualTo(100); + assertThat(sessions).hasSize(100); // Force a new clock (31 min later), don't use setter which would clean expired sessions accessor.setPropertyValue("clock", Clock.offset(this.store.getClock(), Duration.ofMinutes(31))); - assertThat(sessions.size()).isEqualTo(100); + assertThat(sessions).hasSize(100); // Create 1 more which forces a time-based check (clock moved forward) insertSession(); - assertThat(sessions.size()).isEqualTo(1); + assertThat(sessions).hasSize(1); } @Test diff --git a/spring-web/src/test/java/org/springframework/web/server/session/WebSessionIntegrationTests.java b/spring-web/src/test/java/org/springframework/web/server/session/WebSessionIntegrationTests.java index 0fa99e340ba..eb9260ffbf4 100644 --- a/spring-web/src/test/java/org/springframework/web/server/session/WebSessionIntegrationTests.java +++ b/spring-web/src/test/java/org/springframework/web/server/session/WebSessionIntegrationTests.java @@ -199,7 +199,7 @@ public class WebSessionIntegrationTests extends AbstractHttpHandlerIntegrationTe private String extractSessionId(HttpHeaders headers) { List headerValues = headers.get("Set-Cookie"); assertThat(headerValues).isNotNull(); - assertThat(headerValues.size()).isEqualTo(1); + assertThat(headerValues).hasSize(1); for (String s : headerValues.get(0).split(";")){ if (s.startsWith("SESSION=")) { diff --git a/spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternTests.java b/spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternTests.java index b55e21ff43d..10d46806883 100644 --- a/spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternTests.java +++ b/spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternTests.java @@ -577,7 +577,7 @@ public class PathPatternTests { pri = getPathRemaining(pp, "/aaa/bbb"); assertThat(pri.getPathRemaining().value()).isEqualTo(""); assertThat(pri.getPathMatched().value()).isEqualTo("/aaa/bbb"); - assertThat(pri.getUriVariables().size()).isEqualTo(0); + assertThat(pri.getUriVariables()).hasSize(0); pp = parse("/*/{foo}/b*"); pri = getPathRemaining(pp, "/foo"); @@ -807,7 +807,7 @@ public class PathPatternTests { assertThat((Object) checkCapture("/{one}/", "//")).isNull(); assertThat((Object) checkCapture("", "/abc")).isNull(); - assertThat(checkCapture("", "").getUriVariables().size()).isEqualTo(0); + assertThat(checkCapture("", "").getUriVariables()).hasSize(0); checkCapture("{id}", "99", "id", "99"); checkCapture("/customer/{customerId}", "/customer/78", "customerId", "78"); checkCapture("/customer/{customerId}/banana", "/customer/42/banana", "customerId", @@ -817,7 +817,7 @@ public class PathPatternTests { "apple"); checkCapture("/{bla}.*", "/testing.html", "bla", "testing"); PathPattern.PathMatchInfo extracted = checkCapture("/abc", "/abc"); - assertThat(extracted.getUriVariables().size()).isEqualTo(0); + assertThat(extracted.getUriVariables()).hasSize(0); checkCapture("/{bla}/foo","/a/foo"); } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/accept/HeaderContentTypeResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/accept/HeaderContentTypeResolverTests.java index 8c2a104e8a8..561e3172eb2 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/accept/HeaderContentTypeResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/accept/HeaderContentTypeResolverTests.java @@ -44,7 +44,7 @@ public class HeaderContentTypeResolverTests { List mediaTypes = this.resolver.resolveMediaTypes( MockServerWebExchange.from(MockServerHttpRequest.get("/").header("accept", header))); - assertThat(mediaTypes.size()).isEqualTo(4); + assertThat(mediaTypes).hasSize(4); assertThat(mediaTypes.get(0).toString()).isEqualTo("text/html"); assertThat(mediaTypes.get(1).toString()).isEqualTo("text/x-c"); assertThat(mediaTypes.get(2).toString()).isEqualTo("text/x-dvi;q=0.8"); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/config/CorsRegistryTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/config/CorsRegistryTests.java index 92cbe9a4f9a..f03254e7bff 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/config/CorsRegistryTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/config/CorsRegistryTests.java @@ -45,7 +45,7 @@ public class CorsRegistryTests { public void multipleMappings() { this.registry.addMapping("/foo"); this.registry.addMapping("/bar"); - assertThat(this.registry.getCorsConfigurations().size()).isEqualTo(2); + assertThat(this.registry.getCorsConfigurations()).hasSize(2); } @Test @@ -54,7 +54,7 @@ public class CorsRegistryTests { .allowedMethods("DELETE").allowCredentials(false).allowedHeaders("header1", "header2") .exposedHeaders("header3", "header4").maxAge(3600); Map configs = this.registry.getCorsConfigurations(); - assertThat(configs.size()).isEqualTo(1); + assertThat(configs).hasSize(1); CorsConfiguration config = configs.get("/foo"); assertThat(config.getAllowedOrigins()).isEqualTo(Arrays.asList("https://domain2.com", "https://domain2.com")); assertThat(config.getAllowedMethods()).isEqualTo(Collections.singletonList("DELETE")); @@ -83,7 +83,7 @@ public class CorsRegistryTests { this.registry.addMapping("/api/**").combine(otherConfig); Map configs = this.registry.getCorsConfigurations(); - assertThat(configs.size()).isEqualTo(1); + assertThat(configs).hasSize(1); CorsConfiguration config = configs.get("/api/**"); assertThat(config.getAllowedOrigins()).isEqualTo(Collections.singletonList("http://localhost:3000")); assertThat(config.getAllowedMethods()).isEqualTo(Collections.singletonList("*")); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/config/DelegatingWebFluxConfigurationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/config/DelegatingWebFluxConfigurationTests.java index 6714853e39d..050ec4f347a 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/config/DelegatingWebFluxConfigurationTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/config/DelegatingWebFluxConfigurationTests.java @@ -112,7 +112,7 @@ public class DelegatingWebFluxConfigurationTests { boolean condition = initializer.getValidator() instanceof LocalValidatorFactoryBean; assertThat(condition).isTrue(); assertThat(initializer.getConversionService()).isSameAs(formatterRegistry.getValue()); - assertThat(codecsConfigurer.getValue().getReaders().size()).isEqualTo(16); + assertThat(codecsConfigurer.getValue().getReaders()).hasSize(16); } @Test diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/config/ResourceHandlerRegistryTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/config/ResourceHandlerRegistryTests.java index 64934cf08c3..5871af621c2 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/config/ResourceHandlerRegistryTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/config/ResourceHandlerRegistryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -106,7 +106,7 @@ class ResourceHandlerRegistryTests { this.registration.setMediaTypes(Collections.singletonMap("bar", mediaType)); ResourceWebHandler requestHandler = this.registration.getRequestHandler(); - assertThat(requestHandler.getMediaTypes()).size().isEqualTo(1); + assertThat(requestHandler.getMediaTypes()).hasSize(1); assertThat(requestHandler.getMediaTypes()).containsEntry("bar", mediaType); } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/config/ViewResolverRegistryTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/config/ViewResolverRegistryTests.java index 1f69cb33f35..17795b8ce06 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/config/ViewResolverRegistryTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/config/ViewResolverRegistryTests.java @@ -71,7 +71,7 @@ public class ViewResolverRegistryTests { @Test public void noResolvers() { assertThat(this.registry.getViewResolvers()).isNotNull(); - assertThat(this.registry.getViewResolvers().size()).isEqualTo(0); + assertThat(this.registry.getViewResolvers()).hasSize(0); assertThat(this.registry.hasRegistrations()).isFalse(); } @@ -81,7 +81,7 @@ public class ViewResolverRegistryTests { this.registry.viewResolver(viewResolver); assertThat(this.registry.getViewResolvers().get(0)).isSameAs(viewResolver); - assertThat(this.registry.getViewResolvers().size()).isEqualTo(1); + assertThat(this.registry.getViewResolvers()).hasSize(1); } @Test @@ -89,7 +89,7 @@ public class ViewResolverRegistryTests { View view = new HttpMessageWriterView(new Jackson2JsonEncoder()); this.registry.defaultViews(view); - assertThat(this.registry.getDefaultViews().size()).isEqualTo(1); + assertThat(this.registry.getDefaultViews()).hasSize(1); assertThat(this.registry.getDefaultViews().get(0)).isSameAs(view); } @@ -98,7 +98,7 @@ public class ViewResolverRegistryTests { this.registry.scriptTemplate().prefix("/").suffix(".html"); List viewResolvers = this.registry.getViewResolvers(); - assertThat(viewResolvers.size()).isEqualTo(1); + assertThat(viewResolvers).hasSize(1); assertThat(viewResolvers.get(0).getClass()).isEqualTo(ScriptTemplateViewResolver.class); DirectFieldAccessor accessor = new DirectFieldAccessor(viewResolvers.get(0)); assertThat(accessor.getPropertyValue("prefix")).isEqualTo("/"); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/config/WebFluxConfigurationSupportTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/config/WebFluxConfigurationSupportTests.java index 777cbec7533..fed7c90ee04 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/config/WebFluxConfigurationSupportTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/config/WebFluxConfigurationSupportTests.java @@ -131,7 +131,7 @@ public class WebFluxConfigurationSupportTests { assertThat(mapping).isNotNull(); Map map = mapping.getHandlerMethods(); - assertThat(map.size()).isEqualTo(1); + assertThat(map).hasSize(1); assertThat(map.keySet().iterator().next().getPatternsCondition().getPatterns()) .isEqualTo(Collections.singleton(new PathPatternParser().parse("/api/user/{id}"))); } @@ -145,7 +145,7 @@ public class WebFluxConfigurationSupportTests { assertThat(adapter).isNotNull(); List> readers = adapter.getMessageReaders(); - assertThat(readers.size()).isEqualTo(16); + assertThat(readers).hasSize(16); ResolvableType multiValueMapType = forClassWithGenerics(MultiValueMap.class, String.class, String.class); @@ -183,7 +183,7 @@ public class WebFluxConfigurationSupportTests { assertThat(adapter).isNotNull(); List> messageReaders = adapter.getMessageReaders(); - assertThat(messageReaders.size()).isEqualTo(2); + assertThat(messageReaders).hasSize(2); assertHasMessageReader(messageReaders, forClass(String.class), TEXT_PLAIN); assertHasMessageReader(messageReaders, forClass(TestBean.class), APPLICATION_XML); @@ -200,7 +200,7 @@ public class WebFluxConfigurationSupportTests { assertThat(handler.getOrder()).isEqualTo(0); List> writers = handler.getMessageWriters(); - assertThat(writers.size()).isEqualTo(14); + assertThat(writers).hasSize(14); assertHasMessageWriter(writers, forClass(byte[].class), APPLICATION_OCTET_STREAM); assertHasMessageWriter(writers, forClass(ByteBuffer.class), APPLICATION_OCTET_STREAM); @@ -228,7 +228,7 @@ public class WebFluxConfigurationSupportTests { assertThat(handler.getOrder()).isEqualTo(100); List> writers = handler.getMessageWriters(); - assertThat(writers.size()).isEqualTo(14); + assertThat(writers).hasSize(14); assertHasMessageWriter(writers, forClass(byte[].class), APPLICATION_OCTET_STREAM); assertHasMessageWriter(writers, forClass(ByteBuffer.class), APPLICATION_OCTET_STREAM); @@ -256,11 +256,11 @@ public class WebFluxConfigurationSupportTests { assertThat(handler.getOrder()).isEqualTo(Ordered.LOWEST_PRECEDENCE); List resolvers = handler.getViewResolvers(); - assertThat(resolvers.size()).isEqualTo(1); + assertThat(resolvers).hasSize(1); assertThat(resolvers.get(0).getClass()).isEqualTo(FreeMarkerViewResolver.class); List views = handler.getDefaultViews(); - assertThat(views.size()).isEqualTo(1); + assertThat(views).hasSize(1); MimeType type = MimeTypeUtils.parseMimeType("application/json"); assertThat(views.get(0).getSupportedMediaTypes().get(0)).isEqualTo(type); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartIntegrationTests.java index 9b59c236b9f..2287bc73b3f 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartIntegrationTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartIntegrationTests.java @@ -208,7 +208,7 @@ class MultipartIntegrationTests extends AbstractRouterFunctionIntegrationTests { .flatMap(map -> { Map parts = map.toSingleValueMap(); try { - assertThat(parts.size()).isEqualTo(2); + assertThat(parts).hasSize(2); assertThat(((FilePart) parts.get("fooPart")).filename()).isEqualTo("foo.txt"); assertThat(((FormFieldPart) parts.get("barPart")).value()).isEqualTo("bar"); return Flux.fromIterable(parts.values()) @@ -225,7 +225,7 @@ class MultipartIntegrationTests extends AbstractRouterFunctionIntegrationTests { return request.body(BodyExtractors.toParts()).collectList() .flatMap(parts -> { try { - assertThat(parts.size()).isEqualTo(2); + assertThat(parts).hasSize(2); assertThat(((FilePart) parts.get(0)).filename()).isEqualTo("foo.txt"); assertThat(((FormFieldPart) parts.get(1)).value()).isEqualTo("bar"); return Flux.fromIterable(parts) diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java index 14521cbac40..b0069ec8d63 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java @@ -70,9 +70,9 @@ public class DefaultClientRequestBuilderTests { assertThat(result.url()).isEqualTo(DEFAULT_URL); assertThat(result.method()).isEqualTo(GET); - assertThat(result.headers().size()).isEqualTo(1); + assertThat(result.headers()).hasSize(1); assertThat(result.headers().getFirst("foo")).isEqualTo("baar"); - assertThat(result.cookies().size()).isEqualTo(1); + assertThat(result.cookies()).hasSize(1); assertThat(result.cookies().getFirst("baz")).isEqualTo("quux"); assertThat(result.httpRequest()).isNotNull(); assertThat(result.attributes().get("attributeKey")).isEqualTo("attributeValue"); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseBuilderTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseBuilderTests.java index 27eb214a6e5..571321fafc1 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseBuilderTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseBuilderTests.java @@ -88,10 +88,10 @@ class DefaultClientResponseBuilderTests { assertThat(result.statusCode()).isEqualTo(HttpStatus.BAD_REQUEST); - assertThat(result.headers().asHttpHeaders().size()).isEqualTo(3); + assertThat(result.headers().asHttpHeaders()).hasSize(3); assertThat(result.headers().asHttpHeaders().getFirst("foo")).isEqualTo("baar"); assertThat(result.headers().asHttpHeaders().getFirst("bar")).isEqualTo("baz"); - assertThat(result.cookies().size()).isEqualTo(1); + assertThat(result.cookies()).hasSize(1); assertThat(result.cookies().getFirst("baz").getValue()).isEqualTo("quux"); assertThat(result.logPrefix()).isEqualTo("my-prefix"); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultWebClientTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultWebClientTests.java index 0bccd8e28e4..f9e058a76e4 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultWebClientTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultWebClientTests.java @@ -293,19 +293,19 @@ public class DefaultWebClientTests { // Now, verify what each client has. WebClient.Builder builder1 = client1.mutate(); - builder1.filters(filters -> assertThat(filters.size()).isEqualTo(1)); - builder1.defaultHeaders(headers -> assertThat(headers.size()).isEqualTo(1)); - builder1.defaultCookies(cookies -> assertThat(cookies.size()).isEqualTo(1)); + builder1.filters(filters -> assertThat(filters).hasSize(1)); + builder1.defaultHeaders(headers -> assertThat(headers).hasSize(1)); + builder1.defaultCookies(cookies -> assertThat(cookies).hasSize(1)); WebClient.Builder builder2 = client2.mutate(); - builder2.filters(filters -> assertThat(filters.size()).isEqualTo(2)); - builder2.defaultHeaders(headers -> assertThat(headers.size()).isEqualTo(2)); - builder2.defaultCookies(cookies -> assertThat(cookies.size()).isEqualTo(2)); + builder2.filters(filters -> assertThat(filters).hasSize(2)); + builder2.defaultHeaders(headers -> assertThat(headers).hasSize(2)); + builder2.defaultCookies(cookies -> assertThat(cookies).hasSize(2)); WebClient.Builder builder1a = client1a.mutate(); - builder1a.filters(filters -> assertThat(filters.size()).isEqualTo(2)); - builder1a.defaultHeaders(headers -> assertThat(headers.size()).isEqualTo(2)); - builder1a.defaultCookies(cookies -> assertThat(cookies.size()).isEqualTo(2)); + builder1a.filters(filters -> assertThat(filters).hasSize(2)); + builder1a.defaultHeaders(headers -> assertThat(headers).hasSize(2)); + builder1a.defaultCookies(cookies -> assertThat(cookies).hasSize(2)); } @Test diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerRequestTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerRequestTests.java index 0a6d06296bb..783b593c3ca 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerRequestTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerRequestTests.java @@ -403,7 +403,7 @@ public class DefaultServerRequestTests { Mono> resultData = request.formData(); StepVerifier.create(resultData) .consumeNextWith(formData -> { - assertThat(formData.size()).isEqualTo(2); + assertThat(formData).hasSize(2); assertThat(formData.getFirst("foo")).isEqualTo("bar"); assertThat(formData.getFirst("baz")).isEqualTo("qux"); }) @@ -436,7 +436,7 @@ public class DefaultServerRequestTests { Mono> resultData = request.multipartData(); StepVerifier.create(resultData) .consumeNextWith(formData -> { - assertThat(formData.size()).isEqualTo(2); + assertThat(formData).hasSize(2); Part part = formData.getFirst("foo"); boolean condition1 = part instanceof FormFieldPart; diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DispatcherHandlerIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DispatcherHandlerIntegrationTests.java index 2862324575d..b55889c2750 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DispatcherHandlerIntegrationTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DispatcherHandlerIntegrationTests.java @@ -97,7 +97,7 @@ class DispatcherHandlerIntegrationTests extends AbstractHttpHandlerIntegrationTe assertThat(result.getStatusCode()).isEqualTo(HttpStatus.OK); List body = result.getBody(); - assertThat(body.size()).isEqualTo(2); + assertThat(body).hasSize(2); assertThat(body.get(0).getName()).isEqualTo("John"); assertThat(body.get(1).getName()).isEqualTo("Jane"); } @@ -208,13 +208,13 @@ class DispatcherHandlerIntegrationTests extends AbstractHttpHandlerIntegrationTe Map pathVariables = (Map) request.attributes().get(RouterFunctions.URI_TEMPLATE_VARIABLES_ATTRIBUTE); assertThat(pathVariables).isNotNull(); - assertThat(pathVariables.size()).isEqualTo(1); + assertThat(pathVariables).hasSize(1); assertThat(pathVariables.get("foo")).isEqualTo("bar"); pathVariables = (Map) request.attributes().get(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE); assertThat(pathVariables).isNotNull(); - assertThat(pathVariables.size()).isEqualTo(1); + assertThat(pathVariables).hasSize(1); assertThat(pathVariables.get("foo")).isEqualTo("bar"); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/PublisherHandlerFunctionIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/PublisherHandlerFunctionIntegrationTests.java index 02e47f48a93..1f68f02147e 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/PublisherHandlerFunctionIntegrationTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/PublisherHandlerFunctionIntegrationTests.java @@ -75,7 +75,7 @@ class PublisherHandlerFunctionIntegrationTests extends AbstractRouterFunctionInt assertThat(result.getStatusCode()).isEqualTo(HttpStatus.OK); List body = result.getBody(); - assertThat(body.size()).isEqualTo(2); + assertThat(body).hasSize(2); assertThat(body.get(0).getName()).isEqualTo("John"); assertThat(body.get(1).getName()).isEqualTo("Jane"); } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RenderingResponseIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RenderingResponseIntegrationTests.java index 00f3b136e5b..482ad56f498 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RenderingResponseIntegrationTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RenderingResponseIntegrationTests.java @@ -81,7 +81,7 @@ class RenderingResponseIntegrationTests extends AbstractRouterFunctionIntegratio assertThat(result.getStatusCode()).isEqualTo(HttpStatus.OK); Map body = parseBody(result.getBody()); - assertThat(body.size()).isEqualTo(2); + assertThat(body).hasSize(2); assertThat(body.get("name")).isEqualTo("foo"); assertThat(body.get("bar")).isEqualTo("baz"); } @@ -95,7 +95,7 @@ class RenderingResponseIntegrationTests extends AbstractRouterFunctionIntegratio assertThat(result.getStatusCode()).isEqualTo(HttpStatus.OK); Map body = parseBody(result.getBody()); - assertThat(body.size()).isEqualTo(3); + assertThat(body).hasSize(3); assertThat(body.get("name")).isEqualTo("foo"); assertThat(body.get("bar")).isEqualTo("baz"); assertThat(body.get("qux")).isEqualTo("quux"); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/HeadersRequestConditionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/HeadersRequestConditionTests.java index 5b0dd59c812..bfc45abc6df 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/HeadersRequestConditionTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/HeadersRequestConditionTests.java @@ -148,7 +148,7 @@ public class HeadersRequestConditionTests { HeadersRequestCondition result = condition1.combine(condition2); Collection conditions = result.getContent(); - assertThat(conditions.size()).isEqualTo(2); + assertThat(conditions).hasSize(2); } @Test diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ParamsRequestConditionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ParamsRequestConditionTests.java index 7cf95f59383..2628ba21986 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ParamsRequestConditionTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ParamsRequestConditionTests.java @@ -119,7 +119,7 @@ public class ParamsRequestConditionTests { ParamsRequestCondition result = condition1.combine(condition2); Collection conditions = result.getContent(); - assertThat(conditions.size()).isEqualTo(2); + assertThat(conditions).hasSize(2); } } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/PatternsRequestConditionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/PatternsRequestConditionTests.java index 05c7ca81907..0b7c8bde64f 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/PatternsRequestConditionTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/PatternsRequestConditionTests.java @@ -168,7 +168,7 @@ public class PatternsRequestConditionTests { @Test public void equallyMatchingPatternsAreBothPresent() { PatternsRequestCondition c = createPatternsCondition("/a", "/b"); - assertThat(c.getPatterns().size()).isEqualTo(2); + assertThat(c.getPatterns()).hasSize(2); Iterator itr = c.getPatterns().iterator(); assertThat(itr.next().getPatternString()).isEqualTo("/a"); assertThat(itr.next().getPatternString()).isEqualTo("/b"); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/RequestMappingInfoTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/RequestMappingInfoTests.java index 9e08ded149d..1f0f05308fc 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/RequestMappingInfoTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/RequestMappingInfoTests.java @@ -56,7 +56,7 @@ public class RequestMappingInfoTests { PathPattern emptyPattern = (new PathPatternParser()).parse(""); assertThat(info.getPatternsCondition().getPatterns()).isEqualTo(Collections.singleton(emptyPattern)); - assertThat(info.getMethodsCondition().getMethods().size()).isEqualTo(0); + assertThat(info.getMethodsCondition().getMethods()).hasSize(0); assertThat(info.getConsumesCondition().isEmpty()).isTrue(); assertThat(info.getProducesCondition().isEmpty()).isTrue(); assertThat(info.getParamsCondition()).isNotNull(); @@ -93,7 +93,7 @@ public class RequestMappingInfoTests { public void prependPatternWithSlash() { RequestMappingInfo actual = paths("foo").build(); List patterns = new ArrayList<>(actual.getPatternsCondition().getPatterns()); - assertThat(patterns.size()).isEqualTo(1); + assertThat(patterns).hasSize(1); assertThat(patterns.get(0).getPatternString()).isEqualTo("/foo"); } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/RequestMethodsRequestConditionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/RequestMethodsRequestConditionTests.java index b2392b1cd7d..88d9d6feedb 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/RequestMethodsRequestConditionTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/RequestMethodsRequestConditionTests.java @@ -119,7 +119,7 @@ public class RequestMethodsRequestConditionTests { RequestMethodsRequestCondition condition2 = new RequestMethodsRequestCondition(POST); RequestMethodsRequestCondition result = condition1.combine(condition2); - assertThat(result.getContent().size()).isEqualTo(2); + assertThat(result.getContent()).hasSize(2); } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMappingTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMappingTests.java index 142f484ec99..2628e361db1 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMappingTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMappingTests.java @@ -306,7 +306,7 @@ public class RequestMappingInfoHandlerMappingTests { // segment is a sequence of name-value pairs. assertThat(matrixVariables).isNotNull(); - assertThat(matrixVariables.size()).isEqualTo(1); + assertThat(matrixVariables).hasSize(1); assertThat(matrixVariables.getFirst("b")).isEqualTo("c"); assertThat(uriVariables.get("foo")).isEqualTo("a=42"); } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ControllerAdviceTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ControllerAdviceTests.java index d506d2af4b6..1e3ec7f6a2b 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ControllerAdviceTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ControllerAdviceTests.java @@ -107,7 +107,7 @@ public class ControllerAdviceTests { Model model = handle(adapter, controller, "handle").getModel(); - assertThat(model.asMap().size()).isEqualTo(2); + assertThat(model.asMap()).hasSize(2); assertThat(model.asMap().get("attr1")).isEqualTo("lAttr1"); assertThat(model.asMap().get("attr2")).isEqualTo("gAttr2"); } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ModelInitializerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ModelInitializerTests.java index ecae3618254..822bb37d55c 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ModelInitializerTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ModelInitializerTests.java @@ -112,7 +112,7 @@ public class ModelInitializerTests { this.modelInitializer.initModel(handlerMethod, context, this.exchange).block(TIMEOUT); Map model = context.getModel().asMap(); - assertThat(model.size()).isEqualTo(5); + assertThat(model).hasSize(5); Object value = model.get("bean"); assertThat(((TestBean) value).getName()).isEqualTo("Bean"); @@ -141,10 +141,10 @@ public class ModelInitializerTests { WebSession session = this.exchange.getSession().block(Duration.ZERO); assertThat(session).isNotNull(); - assertThat(session.getAttributes().size()).isEqualTo(0); + assertThat(session.getAttributes()).hasSize(0); context.saveModel(); - assertThat(session.getAttributes().size()).isEqualTo(1); + assertThat(session.getAttributes()).hasSize(1); assertThat(((TestBean) session.getRequiredAttribute("bean")).getName()).isEqualTo("Bean"); } @@ -164,7 +164,7 @@ public class ModelInitializerTests { this.modelInitializer.initModel(handlerMethod, context, this.exchange).block(TIMEOUT); context.saveModel(); - assertThat(session.getAttributes().size()).isEqualTo(1); + assertThat(session.getAttributes()).hasSize(1); assertThat(((TestBean) session.getRequiredAttribute("bean")).getName()).isEqualTo("Session Bean"); } @@ -198,7 +198,7 @@ public class ModelInitializerTests { context.getSessionStatus().setComplete(); context.saveModel(); - assertThat(session.getAttributes().size()).isEqualTo(0); + assertThat(session.getAttributes()).hasSize(0); } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMappingTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMappingTests.java index 293ce04780e..a3149efd55f 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMappingTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMappingTests.java @@ -168,11 +168,11 @@ public class RequestMappingHandlerMappingTests { assertThat(info).isNotNull(); Set paths = info.getPatternsCondition().getPatterns(); - assertThat(paths.size()).isEqualTo(1); + assertThat(paths).hasSize(1); assertThat(paths.iterator().next().getPatternString()).isEqualTo(path); Set methods = info.getMethodsCondition().getMethods(); - assertThat(methods.size()).isEqualTo(1); + assertThat(methods).hasSize(1); assertThat(methods.iterator().next()).isEqualTo(requestMethod); return info; diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java index bd25e99a281..7d7484d16fb 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java @@ -358,7 +358,7 @@ public class RequestMappingMessageConversionIntegrationTests extends AbstractReq asList(new Person("Robert"), new Person("Marie")), null, Void.class); assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK); - assertThat(getApplicationContext().getBean(PersonCreateController.class).persons.size()).isEqualTo(2); + assertThat(getApplicationContext().getBean(PersonCreateController.class).persons).hasSize(2); } @ParameterizedHttpServerTest @@ -369,7 +369,7 @@ public class RequestMappingMessageConversionIntegrationTests extends AbstractReq ResponseEntity response = performPost("/person-create/publisher", APPLICATION_XML, people, null, Void.class); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); - assertThat(getApplicationContext().getBean(PersonCreateController.class).persons.size()).isEqualTo(2); + assertThat(getApplicationContext().getBean(PersonCreateController.class).persons).hasSize(2); } @ParameterizedHttpServerTest @@ -380,7 +380,7 @@ public class RequestMappingMessageConversionIntegrationTests extends AbstractReq "/person-create/mono", JSON, new Person("Robert"), null, Void.class); assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK); - assertThat(getApplicationContext().getBean(PersonCreateController.class).persons.size()).isEqualTo(1); + assertThat(getApplicationContext().getBean(PersonCreateController.class).persons).hasSize(1); } @ParameterizedHttpServerTest @@ -391,7 +391,7 @@ public class RequestMappingMessageConversionIntegrationTests extends AbstractReq "/person-create/single", JSON, new Person("Robert"), null, Void.class); assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK); - assertThat(getApplicationContext().getBean(PersonCreateController.class).persons.size()).isEqualTo(1); + assertThat(getApplicationContext().getBean(PersonCreateController.class).persons).hasSize(1); } @ParameterizedHttpServerTest @@ -402,7 +402,7 @@ public class RequestMappingMessageConversionIntegrationTests extends AbstractReq asList(new Person("Robert"), new Person("Marie")), null, Void.class); assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK); - assertThat(getApplicationContext().getBean(PersonCreateController.class).persons.size()).isEqualTo(2); + assertThat(getApplicationContext().getBean(PersonCreateController.class).persons).hasSize(2); } @ParameterizedHttpServerTest @@ -413,7 +413,7 @@ public class RequestMappingMessageConversionIntegrationTests extends AbstractReq ResponseEntity response = performPost("/person-create/flux", APPLICATION_XML, people, null, Void.class); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); - assertThat(getApplicationContext().getBean(PersonCreateController.class).persons.size()).isEqualTo(2); + assertThat(getApplicationContext().getBean(PersonCreateController.class).persons).hasSize(2); } @ParameterizedHttpServerTest @@ -424,7 +424,7 @@ public class RequestMappingMessageConversionIntegrationTests extends AbstractReq asList(new Person("Robert"), new Person("Marie")), null, Void.class); assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK); - assertThat(getApplicationContext().getBean(PersonCreateController.class).persons.size()).isEqualTo(2); + assertThat(getApplicationContext().getBean(PersonCreateController.class).persons).hasSize(2); } @ParameterizedHttpServerTest @@ -435,7 +435,7 @@ public class RequestMappingMessageConversionIntegrationTests extends AbstractReq ResponseEntity response = performPost("/person-create/observable", APPLICATION_XML, people, null, Void.class); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); - assertThat(getApplicationContext().getBean(PersonCreateController.class).persons.size()).isEqualTo(2); + assertThat(getApplicationContext().getBean(PersonCreateController.class).persons).hasSize(2); } @ParameterizedHttpServerTest @@ -446,7 +446,7 @@ public class RequestMappingMessageConversionIntegrationTests extends AbstractReq asList(new Person("Robert"), new Person("Marie")), null, Void.class); assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK); - assertThat(getApplicationContext().getBean(PersonCreateController.class).persons.size()).isEqualTo(2); + assertThat(getApplicationContext().getBean(PersonCreateController.class).persons).hasSize(2); } @ParameterizedHttpServerTest @@ -457,7 +457,7 @@ public class RequestMappingMessageConversionIntegrationTests extends AbstractReq ResponseEntity response = performPost("/person-create/flowable", APPLICATION_XML, people, null, Void.class); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); - assertThat(getApplicationContext().getBean(PersonCreateController.class).persons.size()).isEqualTo(2); + assertThat(getApplicationContext().getBean(PersonCreateController.class).persons).hasSize(2); } @ParameterizedHttpServerTest // gh-23791 diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandlerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandlerTests.java index 0eac1a52303..702ff2ce699 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandlerTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandlerTests.java @@ -173,7 +173,7 @@ public class ResponseEntityResultHandlerTests { this.resultHandler.handleResult(exchange, result).block(Duration.ofSeconds(5)); assertThat(exchange.getResponse().getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); - assertThat(exchange.getResponse().getHeaders().size()).isEqualTo(0); + assertThat(exchange.getResponse().getHeaders()).hasSize(0); assertResponseBodyIsEmpty(exchange); } @@ -187,7 +187,7 @@ public class ResponseEntityResultHandlerTests { this.resultHandler.handleResult(exchange, result).block(Duration.ofSeconds(5)); assertThat(exchange.getResponse().getStatusCode()).isEqualTo(HttpStatus.OK); - assertThat(exchange.getResponse().getHeaders().size()).isEqualTo(1); + assertThat(exchange.getResponse().getHeaders()).hasSize(1); assertThat(exchange.getResponse().getHeaders().getFirst("Allow")).isEqualTo("GET,POST,OPTIONS"); assertResponseBodyIsEmpty(exchange); } @@ -202,7 +202,7 @@ public class ResponseEntityResultHandlerTests { this.resultHandler.handleResult(exchange, result).block(Duration.ofSeconds(5)); assertThat(exchange.getResponse().getStatusCode()).isEqualTo(HttpStatus.CREATED); - assertThat(exchange.getResponse().getHeaders().size()).isEqualTo(1); + assertThat(exchange.getResponse().getHeaders()).hasSize(1); assertThat(exchange.getResponse().getHeaders().getLocation()).isEqualTo(location); assertResponseBodyIsEmpty(exchange); } @@ -272,7 +272,7 @@ public class ResponseEntityResultHandlerTests { this.resultHandler.handleResult(exchange, result).block(Duration.ofSeconds(5)); assertThat(exchange.getResponse().getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST); - assertThat(exchange.getResponse().getHeaders().size()).isEqualTo(2); + assertThat(exchange.getResponse().getHeaders()).hasSize(2); assertThat(exchange.getResponse().getHeaders().getContentType()).isEqualTo(MediaType.APPLICATION_PROBLEM_JSON); assertResponseBody(exchange, "{\"type\":\"about:blank\"," + @@ -401,7 +401,7 @@ public class ResponseEntityResultHandlerTests { this.resultHandler.handleResult(exchange, result).block(Duration.ofSeconds(5)); assertThat(exchange.getResponse().getStatusCode()).isEqualTo(HttpStatus.OK); - assertThat(exchange.getResponse().getHeaders().size()).isEqualTo(1); + assertThat(exchange.getResponse().getHeaders()).hasSize(1); assertThat(exchange.getResponse().getHeaders().getContentType()).isEqualTo(MediaType.APPLICATION_JSON); assertResponseBodyIsEmpty(exchange); } @@ -535,11 +535,11 @@ public class ResponseEntityResultHandlerTests { assertResponseBodyIsEmpty(exchange); } if (etag != null) { - assertThat(exchange.getResponse().getHeaders().get(HttpHeaders.ETAG).size()).isEqualTo(1); + assertThat(exchange.getResponse().getHeaders().get(HttpHeaders.ETAG)).hasSize(1); assertThat(exchange.getResponse().getHeaders().getETag()).isEqualTo(etag); } if (lastModified.isAfter(Instant.EPOCH)) { - assertThat(exchange.getResponse().getHeaders().get(HttpHeaders.LAST_MODIFIED).size()).isEqualTo(1); + assertThat(exchange.getResponse().getHeaders().get(HttpHeaders.LAST_MODIFIED)).hasSize(1); assertThat(exchange.getResponse().getHeaders().getLastModified()).isEqualTo(lastModified.toEpochMilli()); } } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/DefaultRenderingBuilderTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/DefaultRenderingBuilderTests.java index 62b195bef46..d507c559507 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/DefaultRenderingBuilderTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/DefaultRenderingBuilderTests.java @@ -40,7 +40,7 @@ public class DefaultRenderingBuilderTests { assertThat(rendering.view()).isEqualTo("abc"); assertThat(rendering.modelAttributes()).isEqualTo(Collections.emptyMap()); assertThat(rendering.status()).isNull(); - assertThat(rendering.headers().size()).isEqualTo(0); + assertThat(rendering.headers()).hasSize(0); } @Test @@ -95,7 +95,7 @@ public class DefaultRenderingBuilderTests { public void header() throws Exception { Rendering rendering = Rendering.view("foo").header("foo", "bar").build(); - assertThat(rendering.headers().size()).isEqualTo(1); + assertThat(rendering.headers()).hasSize(1); assertThat(rendering.headers().get("foo")).isEqualTo(Collections.singletonList("bar")); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java index f669c8e7220..6bcbcb4cbaf 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java @@ -159,7 +159,7 @@ public class ServletContextSupportTests { for (Resource resource : found) { foundPaths.add(((ServletContextResource) resource).getPath()); } - assertThat(foundPaths.size()).isEqualTo(2); + assertThat(foundPaths).hasSize(2); assertThat(foundPaths.contains("/WEB-INF/context1.xml")).isTrue(); assertThat(foundPaths.contains("/WEB-INF/context2.xml")).isTrue(); } @@ -192,7 +192,7 @@ public class ServletContextSupportTests { for (Resource resource : found) { foundPaths.add(((ServletContextResource) resource).getPath()); } - assertThat(foundPaths.size()).isEqualTo(2); + assertThat(foundPaths).hasSize(2); assertThat(foundPaths.contains("/WEB-INF/mydir1/context1.xml")).isTrue(); assertThat(foundPaths.contains("/WEB-INF/mydir2/context2.xml")).isTrue(); } @@ -232,7 +232,7 @@ public class ServletContextSupportTests { for (Resource resource : found) { foundPaths.add(((ServletContextResource) resource).getPath()); } - assertThat(foundPaths.size()).isEqualTo(3); + assertThat(foundPaths).hasSize(3); assertThat(foundPaths.contains("/WEB-INF/mydir1/context1.xml")).isTrue(); assertThat(foundPaths.contains("/WEB-INF/mydir2/context2.xml")).isTrue(); assertThat(foundPaths.contains("/WEB-INF/mydir2/mydir3/context3.xml")).isTrue(); @@ -261,7 +261,7 @@ public class ServletContextSupportTests { for (Resource resource : found) { foundPaths.add(((ServletContextResource) resource).getPath()); } - assertThat(foundPaths.size()).isEqualTo(2); + assertThat(foundPaths).hasSize(2); assertThat(foundPaths.contains("/WEB-INF/context1.xml")).isTrue(); assertThat(foundPaths.contains("/WEB-INF/context2.xml")).isTrue(); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/FlashMapTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/FlashMapTests.java index 12d2ffde19b..538906280aa 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/FlashMapTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/FlashMapTests.java @@ -78,7 +78,7 @@ public class FlashMapTests { flashMap.addTargetRequestParam("empty", " "); flashMap.addTargetRequestParam("null", null); - assertThat(flashMap.getTargetRequestParams().size()).isEqualTo(1); + assertThat(flashMap.getTargetRequestParams()).hasSize(1); assertThat(flashMap.getTargetRequestParams().getFirst("text")).isEqualTo("abc"); } @@ -92,8 +92,8 @@ public class FlashMapTests { FlashMap flashMap = new FlashMap(); flashMap.addTargetRequestParams(params); - assertThat(flashMap.getTargetRequestParams().size()).isEqualTo(1); - assertThat(flashMap.getTargetRequestParams().get("key").size()).isEqualTo(1); + assertThat(flashMap.getTargetRequestParams()).hasSize(1); + assertThat(flashMap.getTargetRequestParams().get("key")).hasSize(1); assertThat(flashMap.getTargetRequestParams().getFirst("key")).isEqualTo("abc"); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java index 6c79844d34d..d46a84fa6ac 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java @@ -123,7 +123,7 @@ public class AnnotationDrivenBeanDefinitionParserTests { assertThat(value instanceof List).isTrue(); @SuppressWarnings("unchecked") List resolvers = (List) value; - assertThat(resolvers.size()).isEqualTo(3); + assertThat(resolvers).hasSize(3); assertThat(resolvers.get(0) instanceof ServletWebArgumentResolverAdapter).isTrue(); assertThat(resolvers.get(1) instanceof TestHandlerMethodArgumentResolver).isTrue(); assertThat(resolvers.get(2) instanceof TestHandlerMethodArgumentResolver).isTrue(); @@ -144,7 +144,7 @@ public class AnnotationDrivenBeanDefinitionParserTests { assertThat(value instanceof List).isTrue(); @SuppressWarnings("unchecked") List handlers = (List) value; - assertThat(handlers.size()).isEqualTo(2); + assertThat(handlers).hasSize(2); assertThat(handlers.get(0).getClass()).isEqualTo(TestHandlerMethodReturnValueHandler.class); assertThat(handlers.get(1).getClass()).isEqualTo(TestHandlerMethodReturnValueHandler.class); assertThat(handlers.get(1)).isNotSameAs(handlers.get(0)); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java index c52eea70407..e22094980eb 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java @@ -244,7 +244,7 @@ public class MvcNamespaceTests { MockHttpServletResponse response = new MockHttpServletResponse(); HandlerExecutionChain chain = mapping.getHandler(request); - assertThat(chain.getInterceptorList().size()).isEqualTo(1); + assertThat(chain.getInterceptorList()).hasSize(1); assertThat(chain.getInterceptorList().get(0) instanceof ConversionServiceExposingInterceptor).isTrue(); ConversionServiceExposingInterceptor interceptor = (ConversionServiceExposingInterceptor) chain.getInterceptorList().get(0); interceptor.preHandle(request, response, handlerMethod); @@ -264,7 +264,7 @@ public class MvcNamespaceTests { String name = "mvcHandlerMappingIntrospector"; HandlerMappingIntrospector introspector = this.appContext.getBean(name, HandlerMappingIntrospector.class); assertThat(introspector).isNotNull(); - assertThat(introspector.getHandlerMappings().size()).isEqualTo(2); + assertThat(introspector.getHandlerMappings()).hasSize(2); assertThat(introspector.getHandlerMappings().get(0)).isSameAs(mapping); assertThat(introspector.getHandlerMappings().get(1).getClass()).isEqualTo(BeanNameUrlHandlerMapping.class); } @@ -301,7 +301,7 @@ public class MvcNamespaceTests { MockHttpServletResponse response = new MockHttpServletResponse(); HandlerExecutionChain chain = mapping.getHandler(request); - assertThat(chain.getInterceptorList().size()).isEqualTo(1); + assertThat(chain.getInterceptorList()).hasSize(1); assertThat(chain.getInterceptorList().get(0) instanceof ConversionServiceExposingInterceptor).isTrue(); ConversionServiceExposingInterceptor interceptor = (ConversionServiceExposingInterceptor) chain.getInterceptorList().get(0); interceptor.preHandle(request, response, handler); @@ -353,7 +353,7 @@ public class MvcNamespaceTests { request.addParameter("theme", "green"); HandlerExecutionChain chain = mapping.getHandler(request); - assertThat(chain.getInterceptorList().size()).isEqualTo(4); + assertThat(chain.getInterceptorList()).hasSize(4); assertThat(chain.getInterceptorList().get(0) instanceof ConversionServiceExposingInterceptor).isTrue(); assertThat(chain.getInterceptorList().get(1) instanceof LocaleChangeInterceptor).isTrue(); assertThat(chain.getInterceptorList().get(2) instanceof ThemeChangeInterceptor).isTrue(); @@ -361,15 +361,15 @@ public class MvcNamespaceTests { request.setRequestURI("/admin/users"); chain = mapping.getHandler(request); - assertThat(chain.getInterceptorList().size()).isEqualTo(2); + assertThat(chain.getInterceptorList()).hasSize(2); request.setRequestURI("/logged/accounts/12345"); chain = mapping.getHandler(request); - assertThat(chain.getInterceptorList().size()).isEqualTo(3); + assertThat(chain.getInterceptorList()).hasSize(3); request.setRequestURI("/foo/logged"); chain = mapping.getHandler(request); - assertThat(chain.getInterceptorList().size()).isEqualTo(3); + assertThat(chain.getInterceptorList()).hasSize(3); } @Test @@ -469,7 +469,7 @@ public class MvcNamespaceTests { PathResourceResolver pathResolver = (PathResourceResolver) resolvers.get(3); Map locationCharsets = pathResolver.getLocationCharsets(); - assertThat(locationCharsets.size()).isEqualTo(1); + assertThat(locationCharsets).hasSize(1); assertThat(locationCharsets.values().iterator().next()).isEqualTo(StandardCharsets.ISO_8859_1); List transformers = handler.getResourceTransformers(); @@ -578,7 +578,7 @@ public class MvcNamespaceTests { MockHttpServletRequest request = new MockHttpServletRequest("GET", "/"); HandlerExecutionChain chain = mapping.getHandler(request); - assertThat(chain.getInterceptorList().size()).isEqualTo(3); + assertThat(chain.getInterceptorList()).hasSize(3); assertThat(chain.getInterceptorList().get(0) instanceof ConversionServiceExposingInterceptor).isTrue(); assertThat(chain.getInterceptorList().get(1) instanceof LocaleChangeInterceptor).isTrue(); assertThat(chain.getInterceptorList().get(2) instanceof ThemeChangeInterceptor).isTrue(); @@ -604,7 +604,7 @@ public class MvcNamespaceTests { request.setMethod("GET"); HandlerExecutionChain chain = mapping.getHandler(request); - assertThat(chain.getInterceptorList().size()).isEqualTo(3); + assertThat(chain.getInterceptorList()).hasSize(3); assertThat(chain.getInterceptorList().get(0) instanceof ConversionServiceExposingInterceptor).isTrue(); assertThat(chain.getInterceptorList().get(1) instanceof LocaleChangeInterceptor).isTrue(); assertThat(chain.getInterceptorList().get(2) instanceof ThemeChangeInterceptor).isTrue(); @@ -617,7 +617,7 @@ public class MvcNamespaceTests { request = new MockHttpServletRequest("GET", "/foo"); chain = mapping2.getHandler(request); - assertThat(chain.getInterceptorList().size()).isEqualTo(4); + assertThat(chain.getInterceptorList()).hasSize(4); assertThat(chain.getInterceptorList().get(1) instanceof ConversionServiceExposingInterceptor).isTrue(); assertThat(chain.getInterceptorList().get(2) instanceof LocaleChangeInterceptor).isTrue(); assertThat(chain.getInterceptorList().get(3) instanceof ThemeChangeInterceptor).isTrue(); @@ -628,7 +628,7 @@ public class MvcNamespaceTests { request.setContextPath("/myapp"); request.setServletPath("/app"); chain = mapping2.getHandler(request); - assertThat(chain.getInterceptorList().size()).isEqualTo(4); + assertThat(chain.getInterceptorList()).hasSize(4); assertThat(chain.getInterceptorList().get(1) instanceof ConversionServiceExposingInterceptor).isTrue(); assertThat(chain.getInterceptorList().get(2) instanceof LocaleChangeInterceptor).isTrue(); assertThat(chain.getInterceptorList().get(3) instanceof ThemeChangeInterceptor).isTrue(); @@ -639,7 +639,7 @@ public class MvcNamespaceTests { request.setContextPath("/myapp"); request.setServletPath("/app"); chain = mapping2.getHandler(request); - assertThat(chain.getInterceptorList().size()).isEqualTo(4); + assertThat(chain.getInterceptorList()).hasSize(4); assertThat(chain.getInterceptorList().get(1) instanceof ConversionServiceExposingInterceptor).isTrue(); assertThat(chain.getInterceptorList().get(2) instanceof LocaleChangeInterceptor).isTrue(); assertThat(chain.getInterceptorList().get(3) instanceof ThemeChangeInterceptor).isTrue(); @@ -683,7 +683,7 @@ public class MvcNamespaceTests { request.setServletPath("/app/"); request.setAttribute("com.ibm.websphere.servlet.uri_non_decoded", "/myapp/app/bar"); HandlerExecutionChain chain = mapping2.getHandler(request); - assertThat(chain.getInterceptorList().size()).isEqualTo(4); + assertThat(chain.getInterceptorList()).hasSize(4); assertThat(chain.getInterceptorList().get(1) instanceof ConversionServiceExposingInterceptor).isTrue(); assertThat(chain.getInterceptorList().get(2) instanceof LocaleChangeInterceptor).isTrue(); assertThat(chain.getInterceptorList().get(3) instanceof ThemeChangeInterceptor).isTrue(); @@ -695,7 +695,7 @@ public class MvcNamespaceTests { request.setServletPath("/app/"); request.setHttpServletMapping(new MockHttpServletMapping("", "", "", MappingMatch.PATH)); chain = mapping2.getHandler(request); - assertThat(chain.getInterceptorList().size()).isEqualTo(4); + assertThat(chain.getInterceptorList()).hasSize(4); assertThat(chain.getInterceptorList().get(1) instanceof ConversionServiceExposingInterceptor).isTrue(); assertThat(chain.getInterceptorList().get(2) instanceof LocaleChangeInterceptor).isTrue(); assertThat(chain.getInterceptorList().get(3) instanceof ThemeChangeInterceptor).isTrue(); @@ -706,7 +706,7 @@ public class MvcNamespaceTests { request.setContextPath("/myapp"); request.setServletPath("/"); chain = mapping2.getHandler(request); - assertThat(chain.getInterceptorList().size()).isEqualTo(4); + assertThat(chain.getInterceptorList()).hasSize(4); assertThat(chain.getInterceptorList().get(1) instanceof ConversionServiceExposingInterceptor).isTrue(); assertThat(chain.getInterceptorList().get(2) instanceof LocaleChangeInterceptor).isTrue(); assertThat(chain.getInterceptorList().get(3) instanceof ThemeChangeInterceptor).isTrue(); @@ -853,14 +853,14 @@ public class MvcNamespaceTests { ViewResolverComposite compositeResolver = this.appContext.getBean(ViewResolverComposite.class); assertThat(compositeResolver).isNotNull(); - assertThat(compositeResolver.getViewResolvers().size()).isEqualTo(1); + assertThat(compositeResolver.getViewResolvers()).hasSize(1); assertThat(compositeResolver.getOrder()).isEqualTo(Ordered.HIGHEST_PRECEDENCE); List resolvers = compositeResolver.getViewResolvers(); assertThat(resolvers.get(0).getClass()).isEqualTo(ContentNegotiatingViewResolver.class); ContentNegotiatingViewResolver cnvr = (ContentNegotiatingViewResolver) resolvers.get(0); - assertThat(cnvr.getViewResolvers().size()).isEqualTo(5); - assertThat(cnvr.getDefaultViews().size()).isEqualTo(1); + assertThat(cnvr.getViewResolvers()).hasSize(5); + assertThat(cnvr.getDefaultViews()).hasSize(1); assertThat(cnvr.isUseNotAcceptableStatusCode()).isTrue(); String beanName = "contentNegotiationManager"; @@ -915,7 +915,7 @@ public class MvcNamespaceTests { Map configs = ((UrlBasedCorsConfigurationSource) accessor .getPropertyValue("corsConfigurationSource")).getCorsConfigurations(); assertThat(configs).isNotNull(); - assertThat(configs.size()).isEqualTo(1); + assertThat(configs).hasSize(1); CorsConfiguration config = configs.get("/**"); assertThat(config).isNotNull(); assertThat(config.getAllowedOrigins().toArray()).isEqualTo(new String[]{"*"}); @@ -940,7 +940,7 @@ public class MvcNamespaceTests { Map configs = ((UrlBasedCorsConfigurationSource) accessor .getPropertyValue("corsConfigurationSource")).getCorsConfigurations(); assertThat(configs).isNotNull(); - assertThat(configs.size()).isEqualTo(2); + assertThat(configs).hasSize(2); CorsConfiguration config = configs.get("/api/**"); assertThat(config).isNotNull(); assertThat(config.getAllowedOrigins().toArray()).isEqualTo(new String[]{"https://domain1.com", "https://domain2.com"}); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/CorsRegistryTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/CorsRegistryTests.java index 9b64d9c26df..9b267eb814a 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/CorsRegistryTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/CorsRegistryTests.java @@ -50,7 +50,7 @@ public class CorsRegistryTests { public void multipleMappings() { this.registry.addMapping("/foo"); this.registry.addMapping("/bar"); - assertThat(this.registry.getCorsConfigurations().size()).isEqualTo(2); + assertThat(this.registry.getCorsConfigurations()).hasSize(2); } @Test @@ -59,7 +59,7 @@ public class CorsRegistryTests { .allowedMethods("DELETE").allowCredentials(false).allowedHeaders("header1", "header2") .exposedHeaders("header3", "header4").maxAge(3600); Map configs = this.registry.getCorsConfigurations(); - assertThat(configs.size()).isEqualTo(1); + assertThat(configs).hasSize(1); CorsConfiguration config = configs.get("/foo"); assertThat(config.getAllowedOrigins()).isEqualTo(Arrays.asList("https://domain2.com", "https://domain2.com")); assertThat(config.getAllowedMethods()).isEqualTo(Collections.singletonList("DELETE")); @@ -88,7 +88,7 @@ public class CorsRegistryTests { this.registry.addMapping("/api/**").combine(otherConfig); Map configs = this.registry.getCorsConfigurations(); - assertThat(configs.size()).isEqualTo(1); + assertThat(configs).hasSize(1); CorsConfiguration config = configs.get("/api/**"); assertThat(config.getAllowedOrigins()).isEqualTo(Collections.singletonList("http://localhost:3000")); assertThat(config.getAllowedMethods()).isEqualTo(Collections.singletonList("*")); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java index 9460e848ffe..28f046b14cb 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java @@ -112,8 +112,8 @@ public class DelegatingWebMvcConfigurationTests { assertThat(initializer.getConversionService()).isSameAs(conversionService.getValue()); boolean condition = initializer.getValidator() instanceof LocalValidatorFactoryBean; assertThat(condition).isTrue(); - assertThat(resolvers.getValue().size()).isEqualTo(0); - assertThat(handlers.getValue().size()).isEqualTo(0); + assertThat(resolvers.getValue()).hasSize(0); + assertThat(handlers.getValue()).hasSize(0); assertThat(adapter.getMessageConverters()).isEqualTo(converters.getValue()); assertThat(asyncConfigurer).isNotNull(); } @@ -174,7 +174,7 @@ public class DelegatingWebMvcConfigurationTests { verify(webMvcConfigurer).configureContentNegotiation(contentNegotiationConfigurer.capture()); verify(webMvcConfigurer).configureHandlerExceptionResolvers(exceptionResolvers.capture()); - assertThat(exceptionResolvers.getValue().size()).isEqualTo(3); + assertThat(exceptionResolvers.getValue()).hasSize(3); boolean condition2 = exceptionResolvers.getValue().get(0) instanceof ExceptionHandlerExceptionResolver; assertThat(condition2).isTrue(); boolean condition1 = exceptionResolvers.getValue().get(1) instanceof ResponseStatusExceptionResolver; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java index 0f641bfeab0..1150092d632 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java @@ -105,7 +105,7 @@ public class InterceptorRegistryTests { this.registry.addWebRequestInterceptor(this.webInterceptor1); List interceptors = getInterceptorsForPath(null); - assertThat(interceptors.size()).isEqualTo(1); + assertThat(interceptors).hasSize(1); verifyWebInterceptor(interceptors.get(0), this.webInterceptor1); } @@ -115,7 +115,7 @@ public class InterceptorRegistryTests { this.registry.addWebRequestInterceptor(this.webInterceptor2); List interceptors = getInterceptorsForPath(null); - assertThat(interceptors.size()).isEqualTo(2); + assertThat(interceptors).hasSize(2); verifyWebInterceptor(interceptors.get(0), this.webInterceptor1); verifyWebInterceptor(interceptors.get(1), this.webInterceptor2); } @@ -135,11 +135,11 @@ public class InterceptorRegistryTests { this.registry.addWebRequestInterceptor(this.webInterceptor2).addPathPatterns("/path2"); List interceptors = getInterceptorsForPath("/path1"); - assertThat(interceptors.size()).isEqualTo(1); + assertThat(interceptors).hasSize(1); verifyWebInterceptor(interceptors.get(0), this.webInterceptor1); interceptors = getInterceptorsForPath("/path2"); - assertThat(interceptors.size()).isEqualTo(1); + assertThat(interceptors).hasSize(1); verifyWebInterceptor(interceptors.get(0), this.webInterceptor2); } @@ -159,7 +159,7 @@ public class InterceptorRegistryTests { this.registry.addInterceptor(this.interceptor2).order(Ordered.HIGHEST_PRECEDENCE); List interceptors = this.registry.getInterceptors(); - assertThat(interceptors.size()).isEqualTo(2); + assertThat(interceptors).hasSize(2); assertThat(interceptors.get(0)).isSameAs(this.interceptor2); assertThat(interceptors.get(1)).isSameAs(this.interceptor1); @@ -171,7 +171,7 @@ public class InterceptorRegistryTests { this.registry.addInterceptor(this.interceptor2).order(0); List interceptors = this.registry.getInterceptors(); - assertThat(interceptors.size()).isEqualTo(2); + assertThat(interceptors).hasSize(2); assertThat(interceptors.get(0)).isSameAs(this.interceptor1); assertThat(interceptors.get(1)).isSameAs(this.interceptor2); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java index 7cbedbfd00c..b1237632298 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java @@ -231,7 +231,7 @@ public class ResourceHandlerRegistryTests { List resolvers = handler.getResourceResolvers(); PathResourceResolver resolver = (PathResourceResolver) resolvers.get(resolvers.size()-1); Map locationCharsets = resolver.getLocationCharsets(); - assertThat(locationCharsets.size()).isEqualTo(1); + assertThat(locationCharsets).hasSize(1); assertThat(locationCharsets.values().iterator().next()).isEqualTo(StandardCharsets.ISO_8859_1); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolverRegistryTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolverRegistryTests.java index 4986338605c..6efb0da4270 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolverRegistryTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolverRegistryTests.java @@ -86,7 +86,7 @@ public class ViewResolverRegistryTests { @Test public void noResolvers() { assertThat(this.registry.getViewResolvers()).isNotNull(); - assertThat(this.registry.getViewResolvers().size()).isEqualTo(0); + assertThat(this.registry.getViewResolvers()).hasSize(0); assertThat(this.registry.hasRegistrations()).isFalse(); } @@ -100,7 +100,7 @@ public class ViewResolverRegistryTests { @Test public void beanName() { this.registry.beanName(); - assertThat(this.registry.getViewResolvers().size()).isEqualTo(1); + assertThat(this.registry.getViewResolvers()).hasSize(1); assertThat(registry.getViewResolvers().get(0).getClass()).isEqualTo(BeanNameViewResolver.class); } @@ -123,7 +123,7 @@ public class ViewResolverRegistryTests { this.registry.jsp().viewNames("view1", "view2"); this.registry.jsp().viewNames("view3", "view4"); assertThat(this.registry.getViewResolvers()).isNotNull(); - assertThat(this.registry.getViewResolvers().size()).isEqualTo(2); + assertThat(this.registry.getViewResolvers()).hasSize(2); assertThat(this.registry.getViewResolvers().get(0).getClass()).isEqualTo(InternalResourceViewResolver.class); assertThat(this.registry.getViewResolvers().get(1).getClass()).isEqualTo(InternalResourceViewResolver.class); } @@ -199,7 +199,7 @@ public class ViewResolverRegistryTests { @SuppressWarnings("unchecked") private T checkAndGetResolver(Class resolverType) { assertThat(this.registry.getViewResolvers()).isNotNull(); - assertThat(this.registry.getViewResolvers().size()).isEqualTo(1); + assertThat(this.registry.getViewResolvers()).hasSize(1); assertThat(this.registry.getViewResolvers().get(0).getClass()).isEqualTo(resolverType); return (T) registry.getViewResolvers().get(0); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java index 2232f77a25a..0415acb3b5c 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java @@ -144,7 +144,7 @@ public class WebMvcConfigurationSupportExtensionTests { assertThat(interceptors[3].getClass()).isEqualTo(ResourceUrlProviderExposingInterceptor.class); Map map = rmHandlerMapping.getHandlerMethods(); - assertThat(map.size()).isEqualTo(2); + assertThat(map).hasSize(2); RequestMappingInfo info = map.entrySet().stream() .filter(entry -> entry.getValue().getBeanType().equals(UserController.class)) .findFirst() @@ -210,7 +210,7 @@ public class WebMvcConfigurationSupportExtensionTests { // Message converters List> converters = adapter.getMessageConverters(); - assertThat(converters.size()).isEqualTo(2); + assertThat(converters).hasSize(2); assertThat(converters.get(0).getClass()).isEqualTo(StringHttpMessageConverter.class); assertThat(converters.get(1).getClass()).isEqualTo(MappingJackson2HttpMessageConverter.class); ObjectMapper objectMapper = ((MappingJackson2HttpMessageConverter) converters.get(1)).getObjectMapper(); @@ -223,11 +223,11 @@ public class WebMvcConfigurationSupportExtensionTests { // Custom argument resolvers and return value handlers List argResolvers = (List) fieldAccessor.getPropertyValue("customArgumentResolvers"); - assertThat(argResolvers.size()).isEqualTo(1); + assertThat(argResolvers).hasSize(1); List handlers = (List) fieldAccessor.getPropertyValue("customReturnValueHandlers"); - assertThat(handlers.size()).isEqualTo(1); + assertThat(handlers).hasSize(1); // Async support options assertThat(fieldAccessor.getPropertyValue("taskExecutor").getClass()).isEqualTo(ConcurrentTaskExecutor.class); @@ -299,7 +299,7 @@ public class WebMvcConfigurationSupportExtensionTests { List resolvers = ((HandlerExceptionResolverComposite) this.config.handlerExceptionResolver(null)).getExceptionResolvers(); - assertThat(resolvers.size()).isEqualTo(2); + assertThat(resolvers).hasSize(2); assertThat(resolvers.get(0).getClass()).isEqualTo(ResponseStatusExceptionResolver.class); assertThat(resolvers.get(1).getClass()).isEqualTo(SimpleMappingExceptionResolver.class); } @@ -313,19 +313,19 @@ public class WebMvcConfigurationSupportExtensionTests { List viewResolvers = viewResolver.getViewResolvers(); DirectFieldAccessor accessor = new DirectFieldAccessor(viewResolvers.get(0)); - assertThat(viewResolvers.size()).isEqualTo(1); + assertThat(viewResolvers).hasSize(1); assertThat(viewResolvers.get(0).getClass()).isEqualTo(ContentNegotiatingViewResolver.class); assertThat((boolean) (Boolean) accessor.getPropertyValue("useNotAcceptableStatusCode")).isFalse(); assertThat(accessor.getPropertyValue("contentNegotiationManager")).isNotNull(); List defaultViews = (List) accessor.getPropertyValue("defaultViews"); assertThat(defaultViews).isNotNull(); - assertThat(defaultViews.size()).isEqualTo(1); + assertThat(defaultViews).hasSize(1); assertThat(defaultViews.get(0).getClass()).isEqualTo(MappingJackson2JsonView.class); viewResolvers = (List) accessor.getPropertyValue("viewResolvers"); assertThat(viewResolvers).isNotNull(); - assertThat(viewResolvers.size()).isEqualTo(1); + assertThat(viewResolvers).hasSize(1); assertThat(viewResolvers.get(0).getClass()).isEqualTo(InternalResourceViewResolver.class); accessor = new DirectFieldAccessor(viewResolvers.get(0)); assertThat(accessor.getPropertyValue("prefix")).isEqualTo("/"); @@ -335,7 +335,7 @@ public class WebMvcConfigurationSupportExtensionTests { @Test public void crossOrigin() { Map configs = this.config.getCorsConfigurations(); - assertThat(configs.size()).isEqualTo(1); + assertThat(configs).hasSize(1); assertThat(configs.get("/resources/**").getAllowedOrigins().get(0)).isEqualTo("*"); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java index 964ec7b4a1d..9a07ca4aaa5 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java @@ -203,7 +203,7 @@ public class WebMvcConfigurationSupportTests { DirectFieldAccessor fieldAccessor = new DirectFieldAccessor(adapter); @SuppressWarnings("unchecked") List bodyAdvice = (List) fieldAccessor.getPropertyValue("requestResponseBodyAdvice"); - assertThat(bodyAdvice.size()).isEqualTo(2); + assertThat(bodyAdvice).hasSize(2); assertThat(bodyAdvice.get(0).getClass()).isEqualTo(JsonViewRequestBodyAdvice.class); assertThat(bodyAdvice.get(1).getClass()).isEqualTo(JsonViewResponseBodyAdvice.class); } @@ -237,7 +237,7 @@ public class WebMvcConfigurationSupportTests { DirectFieldAccessor fieldAccessor = new DirectFieldAccessor(eher); List interceptors = (List) fieldAccessor.getPropertyValue("responseBodyAdvice"); - assertThat(interceptors.size()).isEqualTo(1); + assertThat(interceptors).hasSize(1); assertThat(interceptors.get(0).getClass()).isEqualTo(JsonViewResponseBodyAdvice.class); LocaleContextHolder.setLocale(Locale.ENGLISH); @@ -260,21 +260,21 @@ public class WebMvcConfigurationSupportTests { HandlerExceptionResolverComposite composite = context.getBean(HandlerExceptionResolverComposite.class); assertThat(adapter).isNotNull(); - assertThat(adapter.getCustomArgumentResolvers().size()).isEqualTo(1); + assertThat(adapter.getCustomArgumentResolvers()).hasSize(1); assertThat(adapter.getCustomArgumentResolvers().get(0).getClass()).isEqualTo(TestArgumentResolver.class); - assertThat(adapter.getCustomReturnValueHandlers().size()).isEqualTo(1); + assertThat(adapter.getCustomReturnValueHandlers()).hasSize(1); assertThat(adapter.getCustomReturnValueHandlers().get(0).getClass()).isEqualTo(TestReturnValueHandler.class); assertThat(composite).isNotNull(); - assertThat(composite.getExceptionResolvers().size()).isEqualTo(3); + assertThat(composite.getExceptionResolvers()).hasSize(3); assertThat(composite.getExceptionResolvers().get(0).getClass()).isEqualTo(ExceptionHandlerExceptionResolver.class); ExceptionHandlerExceptionResolver resolver = (ExceptionHandlerExceptionResolver) composite.getExceptionResolvers().get(0); - assertThat(resolver.getCustomArgumentResolvers().size()).isEqualTo(1); + assertThat(resolver.getCustomArgumentResolvers()).hasSize(1); assertThat(resolver.getCustomArgumentResolvers().get(0).getClass()).isEqualTo(TestArgumentResolver.class); - assertThat(resolver.getCustomReturnValueHandlers().size()).isEqualTo(1); + assertThat(resolver.getCustomReturnValueHandlers()).hasSize(1); assertThat(resolver.getCustomReturnValueHandlers().get(0).getClass()).isEqualTo(TestReturnValueHandler.class); } @@ -285,7 +285,7 @@ public class WebMvcConfigurationSupportTests { ViewResolverComposite resolver = context.getBean("mvcViewResolver", ViewResolverComposite.class); assertThat(resolver).isNotNull(); - assertThat(resolver.getViewResolvers().size()).isEqualTo(1); + assertThat(resolver.getViewResolvers()).hasSize(1); assertThat(resolver.getViewResolvers().get(0).getClass()).isEqualTo(InternalResourceViewResolver.class); assertThat(resolver.getOrder()).isEqualTo(Ordered.LOWEST_PRECEDENCE); } @@ -296,7 +296,7 @@ public class WebMvcConfigurationSupportTests { ViewResolverComposite resolver = context.getBean("mvcViewResolver", ViewResolverComposite.class); assertThat(resolver).isNotNull(); - assertThat(resolver.getViewResolvers().size()).isEqualTo(0); + assertThat(resolver.getViewResolvers()).hasSize(0); assertThat(resolver.getOrder()).isEqualTo(Ordered.LOWEST_PRECEDENCE); assertThat(resolver.resolveViewName("anyViewName", Locale.ENGLISH)).isNull(); } @@ -307,7 +307,7 @@ public class WebMvcConfigurationSupportTests { ViewResolverComposite resolver = context.getBean("mvcViewResolver", ViewResolverComposite.class); assertThat(resolver).isNotNull(); - assertThat(resolver.getViewResolvers().size()).isEqualTo(1); + assertThat(resolver.getViewResolvers()).hasSize(1); assertThat(resolver.getViewResolvers().get(0).getClass()).isEqualTo(InternalResourceViewResolver.class); assertThat(resolver.getOrder()).isEqualTo(123); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerRequestTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerRequestTests.java index d8aa06113e3..0399da52584 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerRequestTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerRequestTests.java @@ -283,7 +283,7 @@ class DefaultServerRequestTests { Collections.singletonList(new MappingJackson2HttpMessageConverter())); List result = request.body(new ParameterizedTypeReference>() {}); - assertThat(result.size()).isEqualTo(2); + assertThat(result).hasSize(2); assertThat(result.get(0)).isEqualTo("foo"); assertThat(result.get(1)).isEqualTo("bar"); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMethodMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMethodMappingTests.java index ccda745f793..60154336441 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMethodMappingTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMethodMappingTests.java @@ -165,14 +165,14 @@ public class HandlerMethodMappingTests { mapping1.setApplicationContext(new StaticApplicationContext(cxt)); mapping1.afterPropertiesSet(); - assertThat(mapping1.getHandlerMethods().size()).isEqualTo(0); + assertThat(mapping1.getHandlerMethods()).hasSize(0); AbstractHandlerMethodMapping mapping2 = new MyHandlerMethodMapping(); mapping2.setDetectHandlerMethodsInAncestorContexts(true); mapping2.setApplicationContext(new StaticApplicationContext(cxt)); mapping2.afterPropertiesSet(); - assertThat(mapping2.getHandlerMethods().size()).isEqualTo(2); + assertThat(mapping2.getHandlerMethods()).hasSize(2); } @Test @@ -186,7 +186,7 @@ public class HandlerMethodMappingTests { List directUrlMatches = this.mapping.getMappingRegistry().getMappingsByDirectPath(key1); assertThat(directUrlMatches).isNotNull(); - assertThat(directUrlMatches.size()).isEqualTo(1); + assertThat(directUrlMatches).hasSize(1); assertThat(directUrlMatches.get(0)).isEqualTo(key1); // Mapping name lookup @@ -197,13 +197,13 @@ public class HandlerMethodMappingTests { String name1 = this.method1.getName(); List handlerMethods = this.mapping.getMappingRegistry().getHandlerMethodsByMappingName(name1); assertThat(handlerMethods).isNotNull(); - assertThat(handlerMethods.size()).isEqualTo(1); + assertThat(handlerMethods).hasSize(1); assertThat(handlerMethods.get(0)).isEqualTo(handlerMethod1); String name2 = this.method2.getName(); handlerMethods = this.mapping.getMappingRegistry().getHandlerMethodsByMappingName(name2); assertThat(handlerMethods).isNotNull(); - assertThat(handlerMethods.size()).isEqualTo(1); + assertThat(handlerMethods).hasSize(1); assertThat(handlerMethods.get(0)).isEqualTo(handlerMethod2); } @@ -225,7 +225,7 @@ public class HandlerMethodMappingTests { List directUrlMatches = this.mapping.getMappingRegistry().getMappingsByDirectPath(key1); assertThat(directUrlMatches).isNotNull(); - assertThat(directUrlMatches.size()).isEqualTo(1); + assertThat(directUrlMatches).hasSize(1); assertThat(directUrlMatches.get(0)).isEqualTo(key1); // Mapping name lookup @@ -233,7 +233,7 @@ public class HandlerMethodMappingTests { String name = this.method1.getName(); List handlerMethods = this.mapping.getMappingRegistry().getHandlerMethodsByMappingName(name); assertThat(handlerMethods).isNotNull(); - assertThat(handlerMethods.size()).isEqualTo(2); + assertThat(handlerMethods).hasSize(2); assertThat(handlerMethods.get(0)).isEqualTo(handlerMethod1); assertThat(handlerMethods.get(1)).isEqualTo(handlerMethod2); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ParameterizableViewControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ParameterizableViewControllerTests.java index 4ed63c4fc37..2760118b518 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ParameterizableViewControllerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ParameterizableViewControllerTests.java @@ -66,7 +66,7 @@ public class ParameterizableViewControllerTests { public void handleRequestWithFlashAttributes() throws Exception { this.request.setAttribute(DispatcherServlet.INPUT_FLASH_MAP_ATTRIBUTE, new ModelMap("name", "value")); ModelAndView mav = this.controller.handleRequest(this.request, new MockHttpServletResponse()); - assertThat(mav.getModel().size()).isEqualTo(1); + assertThat(mav.getModel()).hasSize(1); assertThat(mav.getModel().get("name")).isEqualTo("value"); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/UrlFilenameViewControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/UrlFilenameViewControllerTests.java index a43e86e9ab5..b61271525a1 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/UrlFilenameViewControllerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/UrlFilenameViewControllerTests.java @@ -192,7 +192,7 @@ class UrlFilenameViewControllerTests { request.setAttribute(DispatcherServlet.INPUT_FLASH_MAP_ATTRIBUTE, new ModelMap("name", "value")); ModelAndView mv = controller.handleRequest(request, new MockHttpServletResponse()); assertThat(mv.getViewName()).isEqualTo("index"); - assertThat(mv.getModel().size()).isEqualTo(1); + assertThat(mv.getModel()).hasSize(1); assertThat(mv.getModel().get("name")).isEqualTo("value"); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/HeadersRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/HeadersRequestConditionTests.java index 56d466915c3..6ea961415d7 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/HeadersRequestConditionTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/HeadersRequestConditionTests.java @@ -161,7 +161,7 @@ public class HeadersRequestConditionTests { HeadersRequestCondition result = condition1.combine(condition2); Collection conditions = result.getContent(); - assertThat(conditions.size()).isEqualTo(2); + assertThat(conditions).hasSize(2); } @Test diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ParamsRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ParamsRequestConditionTests.java index 6b1a4d364d0..4af646bc412 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ParamsRequestConditionTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ParamsRequestConditionTests.java @@ -130,7 +130,7 @@ public class ParamsRequestConditionTests { ParamsRequestCondition result = condition1.combine(condition2); Collection conditions = result.getContent(); - assertThat(conditions.size()).isEqualTo(2); + assertThat(conditions).hasSize(2); } } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestConditionTests.java index 7cb38ac95a1..bf6359fbcc1 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestConditionTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestConditionTests.java @@ -123,7 +123,7 @@ public class RequestMethodsRequestConditionTests { RequestMethodsRequestCondition condition2 = new RequestMethodsRequestCondition(POST); RequestMethodsRequestCondition result = condition1.combine(condition2); - assertThat(result.getContent().size()).isEqualTo(2); + assertThat(result.getContent()).hasSize(2); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java index a72865ee7dd..d5b84d4b1b3 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java @@ -364,12 +364,12 @@ class RequestMappingInfoHandlerMappingTests { assertThat(matrixVariables).isNotNull(); if (mapping.getPatternParser() != null) { - assertThat(matrixVariables.size()).isEqualTo(1); + assertThat(matrixVariables).hasSize(1); assertThat(matrixVariables.getFirst("b")).isEqualTo("c"); assertThat(uriVariables.get("foo")).isEqualTo("a=42"); } else { - assertThat(matrixVariables.size()).isEqualTo(2); + assertThat(matrixVariables).hasSize(2); assertThat(matrixVariables.getFirst("a")).isEqualTo("42"); assertThat(matrixVariables.getFirst("b")).isEqualTo("c"); assertThat(uriVariables.get("foo")).isEqualTo("a=42"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java index 0e1cb644cbc..2e3a50e0370 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java @@ -59,7 +59,7 @@ class RequestMappingInfoTests { // gh-22543 RequestMappingInfo info = infoBuilder.build(); assertThat(info.getPatternValues()).isEqualTo(Collections.singleton("")); - assertThat(info.getMethodsCondition().getMethods().size()).isEqualTo(0); + assertThat(info.getMethodsCondition().getMethods()).hasSize(0); assertThat(info.getParamsCondition()).isNotNull(); assertThat(info.getHeadersCondition()).isNotNull(); assertThat(info.getConsumesCondition().isEmpty()).isTrue(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolverTests.java index 42b86b9b909..ea0b5143430 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolverTests.java @@ -228,7 +228,7 @@ public class ExceptionHandlerExceptionResolverTests { ModelAndView mav = this.resolver.resolveException(this.request, this.response, handlerMethod, ex); assertThat(mav).isNotNull(); - assertThat(mav.getModelMap().size()).isEqualTo(1); + assertThat(mav.getModelMap()).hasSize(1); assertThat(mav.getModelMap().get("exceptionClassName")).isEqualTo("IllegalArgumentException"); } @@ -438,8 +438,8 @@ public class ExceptionHandlerExceptionResolverTests { private void assertMethodProcessorCount(int resolverCount, int handlerCount) { - assertThat(this.resolver.getArgumentResolvers().getResolvers().size()).isEqualTo(resolverCount); - assertThat(this.resolver.getReturnValueHandlers().getHandlers().size()).isEqualTo(handlerCount); + assertThat(this.resolver.getArgumentResolvers().getResolvers()).hasSize(resolverCount); + assertThat(this.resolver.getReturnValueHandlers().getHandlers()).hasSize(handlerCount); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorMockTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorMockTests.java index 11b54eb8285..6ac6dc59c2d 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorMockTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorMockTests.java @@ -835,11 +835,11 @@ public class HttpEntityMethodProcessorMockTests { assertThat(servletResponse.getContentAsByteArray().length).isEqualTo(0); } if (etag != null) { - assertThat(servletResponse.getHeaderValues(HttpHeaders.ETAG).size()).isEqualTo(1); + assertThat(servletResponse.getHeaderValues(HttpHeaders.ETAG)).hasSize(1); assertThat(servletResponse.getHeader(HttpHeaders.ETAG)).isEqualTo(etag); } if (lastModified != -1) { - assertThat(servletResponse.getHeaderValues(HttpHeaders.LAST_MODIFIED).size()).isEqualTo(1); + assertThat(servletResponse.getHeaderValues(HttpHeaders.LAST_MODIFIED)).hasSize(1); assertThat((servletResponse.getDateHeader(HttpHeaders.LAST_MODIFIED) / 1000)).isEqualTo((lastModified / 1000)); } } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandlerTests.java index 27a93e1e500..72c0bb09096 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandlerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandlerTests.java @@ -152,7 +152,7 @@ public class ModelAndViewMethodReturnValueHandlerTests { ModelMap model = mavContainer.getModel(); assertThat(mavContainer.getView()).isSameAs(redirectView); - assertThat(model.size()).isEqualTo(1); + assertThat(model).hasSize(1); assertThat(model.get("name")).isEqualTo("value"); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMethodArgumentResolverTests.java index c2753eeb5f2..50ea2fa6c54 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMethodArgumentResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMethodArgumentResolverTests.java @@ -98,7 +98,7 @@ public class PathVariableMethodArgumentResolverTests { @SuppressWarnings("unchecked") Map pathVars = (Map) request.getAttribute(View.PATH_VARIABLES); assertThat(pathVars).isNotNull(); - assertThat(pathVars.size()).isEqualTo(1); + assertThat(pathVars).hasSize(1); assertThat(pathVars.get("name")).isEqualTo("value"); } @@ -114,7 +114,7 @@ public class PathVariableMethodArgumentResolverTests { @SuppressWarnings("unchecked") Map pathVars = (Map) request.getAttribute(View.PATH_VARIABLES); assertThat(pathVars).isNotNull(); - assertThat(pathVars.size()).isEqualTo(1); + assertThat(pathVars).hasSize(1); assertThat(pathVars.get("name")).isEqualTo("value"); } @@ -136,7 +136,7 @@ public class PathVariableMethodArgumentResolverTests { @SuppressWarnings("unchecked") Map pathVars = (Map) request.getAttribute(View.PATH_VARIABLES); assertThat(pathVars).isNotNull(); - assertThat(pathVars.size()).isEqualTo(1); + assertThat(pathVars).hasSize(1); assertThat(pathVars.get("name")).isEqualTo(Optional.of("value")); } @@ -155,7 +155,7 @@ public class PathVariableMethodArgumentResolverTests { @SuppressWarnings("unchecked") Map pathVars = (Map) request.getAttribute(View.PATH_VARIABLES); assertThat(pathVars).isNotNull(); - assertThat(pathVars.size()).isEqualTo(2); + assertThat(pathVars).hasSize(2); assertThat(pathVars.get("name")).isEqualTo("value"); assertThat(pathVars.get("oldName")).isEqualTo("oldValue"); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java index 811922635a0..58003b87553 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java @@ -277,9 +277,9 @@ public class RequestMappingHandlerAdapterTests { } private void assertMethodProcessorCount(int resolverCount, int initBinderResolverCount, int handlerCount) { - assertThat(this.handlerAdapter.getArgumentResolvers().size()).isEqualTo(resolverCount); - assertThat(this.handlerAdapter.getInitBinderArgumentResolvers().size()).isEqualTo(initBinderResolverCount); - assertThat(this.handlerAdapter.getReturnValueHandlers().size()).isEqualTo(handlerCount); + assertThat(this.handlerAdapter.getArgumentResolvers()).hasSize(resolverCount); + assertThat(this.handlerAdapter.getInitBinderArgumentResolvers()).hasSize(initBinderResolverCount); + assertThat(this.handlerAdapter.getReturnValueHandlers()).hasSize(handlerCount); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java index 42408234575..46d8c5be247 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java @@ -299,11 +299,11 @@ public class RequestMappingHandlerMappingTests { assertThat(info).isNotNull(); Set paths = info.getPatternValues(); - assertThat(paths.size()).isEqualTo(1); + assertThat(paths).hasSize(1); assertThat(paths.iterator().next()).isEqualTo(path); Set methods = info.getMethodsCondition().getMethods(); - assertThat(methods.size()).isEqualTo(1); + assertThat(methods).hasSize(1); assertThat(methods.iterator().next()).isEqualTo(requestMethod); return info; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/SseEmitterTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/SseEmitterTests.java index 47844e7e00e..8755203db81 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/SseEmitterTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/SseEmitterTests.java @@ -126,7 +126,7 @@ public class SseEmitterTests { public void assertSentObjectCount(int size) { - assertThat(this.objects.size()).isEqualTo(size); + assertThat(this.objects).hasSize(size); } public void assertObject(int index, Object object) { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/AnnotationConfigDispatcherServletInitializerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/AnnotationConfigDispatcherServletInitializerTests.java index 9339486bd37..3ba093508e9 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/AnnotationConfigDispatcherServletInitializerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/AnnotationConfigDispatcherServletInitializerTests.java @@ -85,7 +85,7 @@ public class AnnotationConfigDispatcherServletInitializerTests { public void register() throws ServletException { initializer.onStartup(servletContext); - assertThat(servlets.size()).isEqualTo(1); + assertThat(servlets).hasSize(1); assertThat(servlets.get(SERVLET_NAME)).isNotNull(); DispatcherServlet servlet = (DispatcherServlet) servlets.get(SERVLET_NAME); @@ -96,7 +96,7 @@ public class AnnotationConfigDispatcherServletInitializerTests { boolean condition = wac.getBean("bean") instanceof MyBean; assertThat(condition).isTrue(); - assertThat(servletRegistrations.size()).isEqualTo(1); + assertThat(servletRegistrations).hasSize(1); assertThat(servletRegistrations.get(SERVLET_NAME)).isNotNull(); MockServletRegistration servletRegistration = servletRegistrations.get(SERVLET_NAME); @@ -106,7 +106,7 @@ public class AnnotationConfigDispatcherServletInitializerTests { assertThat(servletRegistration.getRunAsRole()).isEqualTo(ROLE_NAME); assertThat(servletRegistration.isAsyncSupported()).isTrue(); - assertThat(filterRegistrations.size()).isEqualTo(4); + assertThat(filterRegistrations).hasSize(4); assertThat(filterRegistrations.get("hiddenHttpMethodFilter")).isNotNull(); assertThat(filterRegistrations.get("delegatingFilterProxy")).isNotNull(); assertThat(filterRegistrations.get("delegatingFilterProxy#0")).isNotNull(); @@ -179,7 +179,7 @@ public class AnnotationConfigDispatcherServletInitializerTests { initializer.onStartup(servletContext); - assertThat(filterRegistrations.size()).isEqualTo(0); + assertThat(filterRegistrations).hasSize(0); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/DispatcherServletInitializerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/DispatcherServletInitializerTests.java index 15bf12019e8..d99021f5bae 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/DispatcherServletInitializerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/DispatcherServletInitializerTests.java @@ -59,7 +59,7 @@ public class DispatcherServletInitializerTests { public void register() throws ServletException { initializer.onStartup(servletContext); - assertThat(servlets.size()).isEqualTo(1); + assertThat(servlets).hasSize(1); assertThat(servlets.get(SERVLET_NAME)).isNotNull(); DispatcherServlet servlet = (DispatcherServlet) servlets.get(SERVLET_NAME); @@ -70,7 +70,7 @@ public class DispatcherServletInitializerTests { boolean condition = servletContext.getBean("bean") instanceof MyBean; assertThat(condition).isTrue(); - assertThat(registrations.size()).isEqualTo(1); + assertThat(registrations).hasSize(1); assertThat(registrations.get(SERVLET_NAME)).isNotNull(); MockServletRegistration registration = registrations.get(SERVLET_NAME); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java index fd55353f41d..031be3ea321 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java @@ -351,7 +351,7 @@ public class UrlTagTests extends AbstractTagTests { String uri = tag.replaceUriTemplateParams("url/path", params, usedParams); assertThat(uri).isEqualTo("url/path"); - assertThat(usedParams.size()).isEqualTo(0); + assertThat(usedParams).hasSize(0); } @Test @@ -361,7 +361,7 @@ public class UrlTagTests extends AbstractTagTests { String uri = tag.replaceUriTemplateParams("url/{path}", params, usedParams); assertThat(uri).isEqualTo("url/{path}"); - assertThat(usedParams.size()).isEqualTo(0); + assertThat(usedParams).hasSize(0); } @Test @@ -376,7 +376,7 @@ public class UrlTagTests extends AbstractTagTests { String uri = tag.replaceUriTemplateParams("url/{name}", params, usedParams); assertThat(uri).isEqualTo("url/value"); - assertThat(usedParams.size()).isEqualTo(1); + assertThat(usedParams).hasSize(1); assertThat(usedParams.contains("name")).isTrue(); } @@ -392,7 +392,7 @@ public class UrlTagTests extends AbstractTagTests { String uri = tag.replaceUriTemplateParams("url/{n me}", params, usedParams); assertThat(uri).isEqualTo("url/value"); - assertThat(usedParams.size()).isEqualTo(1); + assertThat(usedParams).hasSize(1); assertThat(usedParams.contains("n me")).isTrue(); } @@ -410,7 +410,7 @@ public class UrlTagTests extends AbstractTagTests { usedParams); assertThat(uri).isEqualTo("url/v%20lue"); - assertThat(usedParams.size()).isEqualTo(1); + assertThat(usedParams).hasSize(1); assertThat(usedParams.contains("name")).isTrue(); } @@ -427,7 +427,7 @@ public class UrlTagTests extends AbstractTagTests { String uri = tag.replaceUriTemplateParams("url/{/name}", params, usedParams); assertThat(uri).isEqualTo("url/my%2FId"); - assertThat(usedParams.size()).isEqualTo(1); + assertThat(usedParams).hasSize(1); assertThat(usedParams.contains("name")).isTrue(); } @@ -443,7 +443,7 @@ public class UrlTagTests extends AbstractTagTests { String uri = tag.replaceUriTemplateParams("url/{name}", params, usedParams); assertThat(uri).isEqualTo("url/my/Id"); - assertThat(usedParams.size()).isEqualTo(1); + assertThat(usedParams).hasSize(1); assertThat(usedParams.contains("name")).isTrue(); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java index 170d1cf36e4..c14aea31033 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java @@ -359,7 +359,7 @@ public class CheckboxesTagTests extends AbstractFormTagTests { int result = this.tag.doStartTag(); assertThat(result).isEqualTo(Tag.SKIP_BODY); - assertThat(editor.allProcessedValues.size()).isEqualTo(3); + assertThat(editor.allProcessedValues).hasSize(3); String output = getOutput(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java index a8e87811b90..623f785ccbb 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java @@ -261,7 +261,7 @@ class OptionsTagTests extends AbstractHtmlElementTagTests { Document document = reader.read(new StringReader(output)); Element rootElement = document.getRootElement(); - assertThat(rootElement.elements().size()).isEqualTo(2); + assertThat(rootElement.elements()).hasSize(2); Node value1 = rootElement.selectSingleNode("option[@value = 'VALUE_1']"); Node value2 = rootElement.selectSingleNode("option[@value = 'VALUE_2']"); assertThat(value1.getText()).isEqualTo("TestEnum: VALUE_1"); @@ -291,7 +291,7 @@ class OptionsTagTests extends AbstractHtmlElementTagTests { Document document = reader.read(new StringReader(output)); Element rootElement = document.getRootElement(); - assertThat(rootElement.elements().size()).isEqualTo(2); + assertThat(rootElement.elements()).hasSize(2); Node value1 = rootElement.selectSingleNode("option[@value = 'Value: VALUE_1']"); Node value2 = rootElement.selectSingleNode("option[@value = 'Value: VALUE_2']"); assertThat(value1.getText()).isEqualTo("Label: VALUE_1"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java index 49d2daf2229..a803ec7a6c3 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java @@ -310,7 +310,7 @@ public class RadioButtonsTagTests extends AbstractFormTagTests { int result = this.tag.doStartTag(); assertThat(result).isEqualTo(Tag.SKIP_BODY); - assertThat(editor.allProcessedValues.size()).isEqualTo(3); + assertThat(editor.allProcessedValues).hasSize(3); String output = getOutput(); @@ -492,7 +492,7 @@ public class RadioButtonsTagTests extends AbstractFormTagTests { Document document = reader.read(new StringReader(output)); Element rootElement = document.getRootElement(); - assertThat(rootElement.elements().size()).isEqualTo(2); + assertThat(rootElement.elements()).hasSize(2); Node value1 = rootElement.selectSingleNode("//input[@value = 'VALUE_1']"); Node value2 = rootElement.selectSingleNode("//input[@value = 'VALUE_2']"); assertThat(rootElement.selectSingleNode("//label[@for = '" + value1.valueOf("@id") + "']").getText()).isEqualTo("TestEnum: VALUE_1"); @@ -517,7 +517,7 @@ public class RadioButtonsTagTests extends AbstractFormTagTests { Document document = reader.read(new StringReader(output)); Element rootElement = document.getRootElement(); - assertThat(rootElement.elements().size()).isEqualTo(2); + assertThat(rootElement.elements()).hasSize(2); Node value1 = rootElement.selectSingleNode("//input[@value = 'Value: VALUE_1']"); Node value2 = rootElement.selectSingleNode("//input[@value = 'Value: VALUE_2']"); assertThat(rootElement.selectSingleNode("//label[@for = '" + value1.valueOf("@id") + "']").getText()).isEqualTo("Label: VALUE_1"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java index d8a69d4d87c..7586dff0f5d 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java @@ -401,7 +401,7 @@ public class SelectTagTests extends AbstractFormTagTests { SAXReader reader = new SAXReader(); Document document = reader.read(new StringReader(output)); Element rootElement = document.getRootElement(); - assertThat(rootElement.elements().size()).isEqualTo(2); + assertThat(rootElement.elements()).hasSize(2); Element selectElement = rootElement.element("select"); assertThat(selectElement.getName()).isEqualTo("select"); @@ -474,7 +474,7 @@ public class SelectTagTests extends AbstractFormTagTests { SAXReader reader = new SAXReader(); Document document = reader.read(new StringReader(output)); Element rootElement = document.getRootElement(); - assertThat(rootElement.elements().size()).isEqualTo(2); + assertThat(rootElement.elements()).hasSize(2); Element selectElement = rootElement.element("select"); assertThat(selectElement.getName()).isEqualTo("select"); @@ -523,7 +523,7 @@ public class SelectTagTests extends AbstractFormTagTests { SAXReader reader = new SAXReader(); Document document = reader.read(new StringReader(output)); Element rootElement = document.getRootElement(); - assertThat(rootElement.elements().size()).isEqualTo(1); + assertThat(rootElement.elements()).hasSize(1); Element selectElement = rootElement.element("select"); assertThat(selectElement.getName()).isEqualTo("select"); @@ -571,7 +571,7 @@ public class SelectTagTests extends AbstractFormTagTests { SAXReader reader = new SAXReader(); Document document = reader.read(new StringReader(output)); Element rootElement = document.getRootElement(); - assertThat(rootElement.elements().size()).isEqualTo(2); + assertThat(rootElement.elements()).hasSize(2); Element selectElement = rootElement.element("select"); assertThat(selectElement.getName()).isEqualTo("select"); @@ -617,7 +617,7 @@ public class SelectTagTests extends AbstractFormTagTests { SAXReader reader = new SAXReader(); Document document = reader.read(new StringReader(output)); Element rootElement = document.getRootElement(); - assertThat(rootElement.elements().size()).isEqualTo(2); + assertThat(rootElement.elements()).hasSize(2); Element selectElement = rootElement.element("select"); assertThat(selectElement.getName()).isEqualTo("select"); @@ -652,7 +652,7 @@ public class SelectTagTests extends AbstractFormTagTests { SAXReader reader = new SAXReader(); Document document = reader.read(new StringReader(output)); Element rootElement = document.getRootElement(); - assertThat(rootElement.elements().size()).isEqualTo(2); + assertThat(rootElement.elements()).hasSize(2); Element selectElement = rootElement.element("select"); assertThat(selectElement.getName()).isEqualTo("select"); @@ -728,7 +728,7 @@ public class SelectTagTests extends AbstractFormTagTests { SAXReader reader = new SAXReader(); Document document = reader.read(new StringReader(output)); Element rootElement = document.getRootElement(); - assertThat(rootElement.elements().size()).isEqualTo(2); + assertThat(rootElement.elements()).hasSize(2); Element selectElement = rootElement.element("select"); assertThat(selectElement.getName()).isEqualTo("select"); @@ -771,7 +771,7 @@ public class SelectTagTests extends AbstractFormTagTests { SAXReader reader = new SAXReader(); Document document = reader.read(new StringReader(output)); Element rootElement = document.getRootElement(); - assertThat(rootElement.elements().size()).isEqualTo(2); + assertThat(rootElement.elements()).hasSize(2); Element selectElement = rootElement.element("select"); assertThat(selectElement.getName()).isEqualTo("select"); @@ -800,7 +800,7 @@ public class SelectTagTests extends AbstractFormTagTests { SAXReader reader = new SAXReader(); Document document = reader.read(new StringReader(output)); Element rootElement = document.getRootElement(); - assertThat(rootElement.elements().size()).isEqualTo(2); + assertThat(rootElement.elements()).hasSize(2); Element selectElement = rootElement.element("select"); assertThat(selectElement.getName()).isEqualTo("select"); @@ -829,7 +829,7 @@ public class SelectTagTests extends AbstractFormTagTests { SAXReader reader = new SAXReader(); Document document = reader.read(new StringReader(output)); Element rootElement = document.getRootElement(); - assertThat(rootElement.elements().size()).isEqualTo(2); + assertThat(rootElement.elements()).hasSize(2); Element selectElement = rootElement.element("select"); assertThat(selectElement.getName()).isEqualTo("select"); @@ -858,7 +858,7 @@ public class SelectTagTests extends AbstractFormTagTests { SAXReader reader = new SAXReader(); Document document = reader.read(new StringReader(output)); Element rootElement = document.getRootElement(); - assertThat(rootElement.elements().size()).isEqualTo(1); + assertThat(rootElement.elements()).hasSize(1); Element selectElement = rootElement.element("select"); assertThat(selectElement.getName()).isEqualTo("select"); @@ -884,7 +884,7 @@ public class SelectTagTests extends AbstractFormTagTests { SAXReader reader = new SAXReader(); Document document = reader.read(new StringReader(output)); Element rootElement = document.getRootElement(); - assertThat(rootElement.elements().size()).isEqualTo(2); + assertThat(rootElement.elements()).hasSize(2); Element selectElement = rootElement.element("select"); assertThat(selectElement.getName()).isEqualTo("select"); @@ -913,7 +913,7 @@ public class SelectTagTests extends AbstractFormTagTests { SAXReader reader = new SAXReader(); Document document = reader.read(new StringReader(output)); Element rootElement = document.getRootElement(); - assertThat(rootElement.elements().size()).isEqualTo(1); + assertThat(rootElement.elements()).hasSize(1); Element selectElement = rootElement.element("select"); assertThat(selectElement.getName()).isEqualTo("select"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java index 29c69d17568..13bcaff034d 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java @@ -126,7 +126,7 @@ public class BaseViewTests { checkContainsAll(pathVars, tv.model); - assertThat(tv.model.size()).isEqualTo(3); + assertThat(tv.model).hasSize(3); assertThat(tv.model.get("something")).isEqualTo("else"); assertThat(tv.initialized).isTrue(); } @@ -154,7 +154,7 @@ public class BaseViewTests { // Check it contains all checkContainsAll(model, tv.model); - assertThat(tv.model.size()).isEqualTo(3); + assertThat(tv.model).hasSize(3); assertThat(tv.model.get("something")).isEqualTo("else"); assertThat(tv.initialized).isTrue(); } @@ -182,7 +182,7 @@ public class BaseViewTests { tv.render(model, request, response); checkContainsAll(model, tv.model); - assertThat(tv.model.size()).isEqualTo(3); + assertThat(tv.model).hasSize(3); assertThat(tv.model.get("something")).isEqualTo("else"); assertThat(tv.initialized).isTrue(); } @@ -191,7 +191,7 @@ public class BaseViewTests { public void ignoresNullAttributes() { AbstractView v = new ConcreteView(); v.setAttributes(null); - assertThat(v.getStaticAttributes().size()).isEqualTo(0); + assertThat(v.getStaticAttributes()).hasSize(0); } /** @@ -201,14 +201,14 @@ public class BaseViewTests { public void attributeCSVParsingIgnoresNull() { AbstractView v = new ConcreteView(); v.setAttributesCSV(null); - assertThat(v.getStaticAttributes().size()).isEqualTo(0); + assertThat(v.getStaticAttributes()).hasSize(0); } @Test public void attributeCSVParsingIgnoresEmptyString() { AbstractView v = new ConcreteView(); v.setAttributesCSV(""); - assertThat(v.getStaticAttributes().size()).isEqualTo(0); + assertThat(v.getStaticAttributes()).hasSize(0); } /** @@ -259,7 +259,7 @@ public class BaseViewTests { public void attributeCSVParsingIgnoresTrailingComma() { AbstractView v = new ConcreteView(); v.setAttributesCSV("foo=[de],"); - assertThat(v.getStaticAttributes().size()).isEqualTo(1); + assertThat(v.getStaticAttributes()).hasSize(1); } /** diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketExtensionTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketExtensionTests.java index 2cbbbd1052c..21e10d1d42e 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketExtensionTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketExtensionTests.java @@ -40,7 +40,7 @@ public class WebSocketExtensionTests { WebSocketExtension extension = extensions.get(0); assertThat(extension.getName()).isEqualTo("x-test-extension"); - assertThat(extension.getParameters().size()).isEqualTo(2); + assertThat(extension.getParameters()).hasSize(2); assertThat(extension.getParameters().get("foo")).isEqualTo("bar"); assertThat(extension.getParameters().get("bar")).isEqualTo("baz"); } diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketHandshakeTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketHandshakeTests.java index 5eac8bb90bd..c5754ad326f 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketHandshakeTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketHandshakeTests.java @@ -80,7 +80,7 @@ class WebSocketHandshakeTests extends AbstractWebSocketIntegrationTests { serverHandler.await(); assertThat(serverHandler.getTransportError()).isNull(); - assertThat(serverHandler.getReceivedMessages().size()).isEqualTo(1); + assertThat(serverHandler.getReceivedMessages()).hasSize(1); assertThat(serverHandler.getReceivedMessages().get(0).getClass()).isEqualTo(PongMessage.class); } diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/client/standard/StandardWebSocketClientTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/client/standard/StandardWebSocketClientTests.java index b4a28db6786..338063ad6b7 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/client/standard/StandardWebSocketClientTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/client/standard/StandardWebSocketClientTests.java @@ -116,7 +116,7 @@ public class StandardWebSocketClientTests { WebSocketSession session = this.wsClient.doHandshake(this.wsHandler, this.headers, uri).get(); - assertThat(session.getHandshakeHeaders().size()).isEqualTo(1); + assertThat(session.getHandshakeHeaders()).hasSize(1); assertThat(session.getHandshakeHeaders().getFirst("foo")).isEqualTo("bar"); } @@ -166,7 +166,7 @@ public class StandardWebSocketClientTests { Map> headers = new HashMap<>(); endpointConfig.getConfigurator().beforeRequest(headers); - assertThat(headers.size()).isEqualTo(1); + assertThat(headers).hasSize(1); } @Test diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java index fdaea640bae..db59246642c 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java @@ -399,12 +399,12 @@ public class MessageBrokerBeanDefinitionParserTests { SimpAnnotationMethodMessageHandler handler = this.appContext.getBean(SimpAnnotationMethodMessageHandler.class); List customResolvers = handler.getCustomArgumentResolvers(); - assertThat(customResolvers.size()).isEqualTo(2); + assertThat(customResolvers).hasSize(2); assertThat(handler.getArgumentResolvers().contains(customResolvers.get(0))).isTrue(); assertThat(handler.getArgumentResolvers().contains(customResolvers.get(1))).isTrue(); List customHandlers = handler.getCustomReturnValueHandlers(); - assertThat(customHandlers.size()).isEqualTo(2); + assertThat(customHandlers).hasSize(2); assertThat(handler.getReturnValueHandlers().contains(customHandlers.get(0))).isTrue(); assertThat(handler.getReturnValueHandlers().contains(customHandlers.get(1))).isTrue(); } @@ -416,7 +416,7 @@ public class MessageBrokerBeanDefinitionParserTests { CompositeMessageConverter compositeConverter = this.appContext.getBean(CompositeMessageConverter.class); assertThat(compositeConverter).isNotNull(); - assertThat(compositeConverter.getConverters().size()).isEqualTo(4); + assertThat(compositeConverter.getConverters()).hasSize(4); assertThat(compositeConverter.getConverters().iterator().next().getClass()).isEqualTo(StringMessageConverter.class); } @@ -427,7 +427,7 @@ public class MessageBrokerBeanDefinitionParserTests { CompositeMessageConverter compositeConverter = this.appContext.getBean(CompositeMessageConverter.class); assertThat(compositeConverter).isNotNull(); - assertThat(compositeConverter.getConverters().size()).isEqualTo(1); + assertThat(compositeConverter.getConverters()).hasSize(1); assertThat(compositeConverter.getConverters().iterator().next().getClass()).isEqualTo(StringMessageConverter.class); } @@ -442,7 +442,7 @@ public class MessageBrokerBeanDefinitionParserTests { assertThat(channel.hasSubscription(subscriber)).isTrue(); } List interceptors = channel.getInterceptors(); - assertThat(interceptors.size()).isEqualTo(interceptorCount); + assertThat(interceptors).hasSize(interceptorCount); assertThat(interceptors.get(interceptors.size() - 1).getClass()).isEqualTo(ImmutableMessageChannelInterceptor.class); } diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebMvcStompEndpointRegistryTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebMvcStompEndpointRegistryTests.java index 30cb2609eed..593fd21d874 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebMvcStompEndpointRegistryTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebMvcStompEndpointRegistryTests.java @@ -63,7 +63,7 @@ public class WebMvcStompEndpointRegistryTests { this.endpointRegistry.addEndpoint("/stomp"); Map protocolHandlers = webSocketHandler.getProtocolHandlerMap(); - assertThat(protocolHandlers.size()).isEqualTo(3); + assertThat(protocolHandlers).hasSize(3); assertThat(protocolHandlers.get("v10.stomp")).isNotNull(); assertThat(protocolHandlers.get("v11.stomp")).isNotNull(); assertThat(protocolHandlers.get("v12.stomp")).isNotNull(); @@ -72,7 +72,7 @@ public class WebMvcStompEndpointRegistryTests { @Test public void handlerMapping() { SimpleUrlHandlerMapping hm = (SimpleUrlHandlerMapping) this.endpointRegistry.getHandlerMapping(); - assertThat(hm.getUrlMap().size()).isEqualTo(0); + assertThat(hm.getUrlMap()).hasSize(0); UrlPathHelper pathHelper = new UrlPathHelper(); this.endpointRegistry.setUrlPathHelper(pathHelper); @@ -80,10 +80,10 @@ public class WebMvcStompEndpointRegistryTests { this.endpointRegistry.addEndpoint("/stompOverSockJS").withSockJS(); //SPR-12403 - assertThat(this.webSocketHandler.getProtocolHandlers().size()).isEqualTo(1); + assertThat(this.webSocketHandler.getProtocolHandlers()).hasSize(1); hm = (SimpleUrlHandlerMapping) this.endpointRegistry.getHandlerMapping(); - assertThat(hm.getUrlMap().size()).isEqualTo(2); + assertThat(hm.getUrlMap()).hasSize(2); assertThat(hm.getUrlMap().get("/stompOverWebSocket")).isNotNull(); assertThat(hm.getUrlMap().get("/stompOverSockJS/**")).isNotNull(); assertThat(hm.getUrlPathHelper()).isSameAs(pathHelper); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketHandlerRegistrationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketHandlerRegistrationTests.java index f7dae4c8cb0..5d653a77f8c 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketHandlerRegistrationTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketHandlerRegistrationTests.java @@ -55,7 +55,7 @@ public class WebSocketHandlerRegistrationTests { this.registration.addHandler(handler, "/foo", "/bar"); List mappings = this.registration.getMappings(); - assertThat(mappings.size()).isEqualTo(2); + assertThat(mappings).hasSize(2); Mapping m1 = mappings.get(0); assertThat(m1.webSocketHandler).isEqualTo(handler); @@ -80,7 +80,7 @@ public class WebSocketHandlerRegistrationTests { this.registration.addHandler(handler, "/foo").addInterceptors(interceptor); List mappings = this.registration.getMappings(); - assertThat(mappings.size()).isEqualTo(1); + assertThat(mappings).hasSize(1); Mapping mapping = mappings.get(0); assertThat(mapping.webSocketHandler).isEqualTo(handler); @@ -99,7 +99,7 @@ public class WebSocketHandlerRegistrationTests { this.registration.addHandler(handler, "/foo").addInterceptors(interceptor).setAllowedOrigins(); List mappings = this.registration.getMappings(); - assertThat(mappings.size()).isEqualTo(1); + assertThat(mappings).hasSize(1); Mapping mapping = mappings.get(0); assertThat(mapping.webSocketHandler).isEqualTo(handler); @@ -121,7 +121,7 @@ public class WebSocketHandlerRegistrationTests { .setAllowedOriginPatterns("https://*.abc.com"); List mappings = this.registration.getMappings(); - assertThat(mappings.size()).isEqualTo(1); + assertThat(mappings).hasSize(1); Mapping mapping = mappings.get(0); assertThat(mapping.webSocketHandler).isEqualTo(handler); @@ -149,7 +149,7 @@ public class WebSocketHandlerRegistrationTests { this.registration.getSockJsServiceRegistration().setTaskScheduler(this.taskScheduler); List mappings = this.registration.getMappings(); - assertThat(mappings.size()).isEqualTo(1); + assertThat(mappings).hasSize(1); Mapping mapping = mappings.get(0); assertThat(mapping.webSocketHandler).isEqualTo(handler); @@ -172,7 +172,7 @@ public class WebSocketHandlerRegistrationTests { this.registration.addHandler(handler, "/foo").setHandshakeHandler(handshakeHandler); List mappings = this.registration.getMappings(); - assertThat(mappings.size()).isEqualTo(1); + assertThat(mappings).hasSize(1); Mapping mapping = mappings.get(0); assertThat(mapping.webSocketHandler).isEqualTo(handler); @@ -189,7 +189,7 @@ public class WebSocketHandlerRegistrationTests { this.registration.getSockJsServiceRegistration().setTaskScheduler(this.taskScheduler); List mappings = this.registration.getMappings(); - assertThat(mappings.size()).isEqualTo(1); + assertThat(mappings).hasSize(1); Mapping mapping = mappings.get(0); assertThat(mapping.webSocketHandler).isEqualTo(handler); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/handler/ConcurrentWebSocketSessionDecoratorTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/handler/ConcurrentWebSocketSessionDecoratorTests.java index 3ba01e858be..329d365f49e 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/handler/ConcurrentWebSocketSessionDecoratorTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/handler/ConcurrentWebSocketSessionDecoratorTests.java @@ -50,7 +50,7 @@ public class ConcurrentWebSocketSessionDecoratorTests { TextMessage textMessage = new TextMessage("payload"); decorator.sendMessage(textMessage); - assertThat(session.getSentMessages().size()).isEqualTo(1); + assertThat(session.getSentMessages()).hasSize(1); assertThat(session.getSentMessages().get(0)).isEqualTo(textMessage); assertThat(decorator.getBufferSize()).isEqualTo(0); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/DefaultSimpUserRegistryTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/DefaultSimpUserRegistryTests.java index 558b547c092..da206f89913 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/DefaultSimpUserRegistryTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/DefaultSimpUserRegistryTests.java @@ -56,7 +56,7 @@ public class DefaultSimpUserRegistryTests { assertThat(simpUser).isNotNull(); assertThat(registry.getUserCount()).isEqualTo(1); - assertThat(simpUser.getSessions().size()).isEqualTo(1); + assertThat(simpUser.getSessions()).hasSize(1); assertThat(simpUser.getSession("123")).isNotNull(); } @@ -81,7 +81,7 @@ public class DefaultSimpUserRegistryTests { assertThat(simpUser).isNotNull(); assertThat(registry.getUserCount()).isEqualTo(1); - assertThat(simpUser.getSessions().size()).isEqualTo(3); + assertThat(simpUser.getSessions()).hasSize(3); assertThat(simpUser.getSession("123")).isNotNull(); assertThat(simpUser.getSession("456")).isNotNull(); assertThat(simpUser.getSession("789")).isNotNull(); @@ -106,7 +106,7 @@ public class DefaultSimpUserRegistryTests { SimpUser simpUser = registry.getUser("joe"); assertThat(simpUser).isNotNull(); - assertThat(simpUser.getSessions().size()).isEqualTo(3); + assertThat(simpUser.getSessions()).hasSize(3); CloseStatus status = CloseStatus.GOING_AWAY; message = createMessage(SimpMessageType.DISCONNECT, "456"); @@ -117,7 +117,7 @@ public class DefaultSimpUserRegistryTests { disconnectEvent = new SessionDisconnectEvent(this, message, "789", status, user); registry.onApplicationEvent(disconnectEvent); - assertThat(simpUser.getSessions().size()).isEqualTo(1); + assertThat(simpUser.getSessions()).hasSize(1); assertThat(simpUser.getSession("123")).isNotNull(); } @@ -144,7 +144,7 @@ public class DefaultSimpUserRegistryTests { Set matches = registry.findSubscriptions(subscription -> subscription.getDestination().equals("/match")); - assertThat(matches.size()).isEqualTo(2); + assertThat(matches).hasSize(2); Iterator iterator = matches.iterator(); Set sessionIds = new HashSet<>(2); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java index a87a80b0893..27af3b014f5 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java @@ -106,7 +106,7 @@ public class StompSubProtocolHandlerTests { Message message = MessageBuilder.createMessage(EMPTY_PAYLOAD, headers.getMessageHeaders()); this.protocolHandler.handleMessageToClient(this.session, message); - assertThat(this.session.getSentMessages().size()).isEqualTo(1); + assertThat(this.session.getSentMessages()).hasSize(1); WebSocketMessage textMessage = this.session.getSentMessages().get(0); assertThat(textMessage.getPayload()).isEqualTo(""" CONNECTED @@ -123,7 +123,7 @@ public class StompSubProtocolHandlerTests { Message message = MessageBuilder.createMessage(EMPTY_PAYLOAD, headers.getMessageHeaders()); this.protocolHandler.handleMessageToClient(this.session, message); - assertThat(this.session.getSentMessages().size()).isEqualTo(1); + assertThat(this.session.getSentMessages()).hasSize(1); WebSocketMessage textMessage = this.session.getSentMessages().get(0); assertThat(textMessage.getPayload()).isEqualTo(""" CONNECTED @@ -145,7 +145,7 @@ public class StompSubProtocolHandlerTests { Message ackMessage = MessageBuilder.createMessage(EMPTY_PAYLOAD, ackAccessor.getMessageHeaders()); this.protocolHandler.handleMessageToClient(this.session, ackMessage); - assertThat(this.session.getSentMessages().size()).isEqualTo(1); + assertThat(this.session.getSentMessages()).hasSize(1); TextMessage actual = (TextMessage) this.session.getSentMessages().get(0); assertThat(actual.getPayload()).isEqualTo(""" CONNECTED @@ -168,7 +168,7 @@ public class StompSubProtocolHandlerTests { Message ackMessage = MessageBuilder.createMessage(EMPTY_PAYLOAD, ackAccessor.getMessageHeaders()); this.protocolHandler.handleMessageToClient(this.session, ackMessage); - assertThat(this.session.getSentMessages().size()).isEqualTo(1); + assertThat(this.session.getSentMessages()).hasSize(1); TextMessage actual = (TextMessage) this.session.getSentMessages().get(0); assertThat(actual.getPayload()).isEqualTo(""" CONNECTED @@ -189,7 +189,7 @@ public class StompSubProtocolHandlerTests { Message ackMessage = MessageBuilder.createMessage(EMPTY_PAYLOAD, ackAccessor.getMessageHeaders()); this.protocolHandler.handleMessageToClient(this.session, ackMessage); - assertThat(this.session.getSentMessages().size()).isEqualTo(1); + assertThat(this.session.getSentMessages()).hasSize(1); TextMessage actual = (TextMessage) this.session.getSentMessages().get(0); assertThat(actual.getPayload()).isEqualTo(""" ERROR @@ -210,7 +210,7 @@ public class StompSubProtocolHandlerTests { Message ackMessage = MessageBuilder.createMessage(EMPTY_PAYLOAD, ackAccessor.getMessageHeaders()); this.protocolHandler.handleMessageToClient(this.session, ackMessage); - assertThat(this.session.getSentMessages().size()).isEqualTo(1); + assertThat(this.session.getSentMessages()).hasSize(1); TextMessage actual = (TextMessage) this.session.getSentMessages().get(0); assertThat(actual.getPayload()).isEqualTo(""" RECEIPT @@ -227,7 +227,7 @@ public class StompSubProtocolHandlerTests { Message ackMessage = MessageBuilder.createMessage(EMPTY_PAYLOAD, accessor.getMessageHeaders()); this.protocolHandler.handleMessageToClient(this.session, ackMessage); - assertThat(this.session.getSentMessages().size()).isEqualTo(1); + assertThat(this.session.getSentMessages()).hasSize(1); TextMessage actual = (TextMessage) this.session.getSentMessages().get(0); assertThat(actual.getPayload()).isEqualTo("\n"); } @@ -270,7 +270,7 @@ public class StompSubProtocolHandlerTests { Message message = MessageBuilder.createMessage(EMPTY_PAYLOAD, headers.getMessageHeaders()); this.protocolHandler.handleMessageToClient(this.session, message); - assertThat(this.session.getSentMessages().size()).isEqualTo(1); + assertThat(this.session.getSentMessages()).hasSize(1); WebSocketMessage textMessage = this.session.getSentMessages().get(0); assertThat(((String) textMessage.getPayload()).contains("destination:/user/queue/foo\n")).isTrue(); assertThat(((String) textMessage.getPayload()).contains(SimpMessageHeaderAccessor.ORIGINAL_DESTINATION)).isFalse(); @@ -292,7 +292,7 @@ public class StompSubProtocolHandlerTests { Message message = MessageBuilder.createMessage(payload, headers.getMessageHeaders()); this.protocolHandler.handleMessageToClient(this.session, message); - assertThat(this.session.getSentMessages().size()).isEqualTo(1); + assertThat(this.session.getSentMessages()).hasSize(1); WebSocketMessage webSocketMessage = this.session.getSentMessages().get(0); assertThat(webSocketMessage instanceof BinaryMessage).isTrue(); @@ -302,7 +302,7 @@ public class StompSubProtocolHandlerTests { message = MessageBuilder.createMessage(payload, headers.getMessageHeaders()); this.protocolHandler.handleMessageToClient(this.session, message); - assertThat(this.session.getSentMessages().size()).isEqualTo(2); + assertThat(this.session.getSentMessages()).hasSize(2); webSocketMessage = this.session.getSentMessages().get(1); assertThat(webSocketMessage instanceof TextMessage).isTrue(); } @@ -332,7 +332,7 @@ public class StompSubProtocolHandlerTests { assertThat(stompAccessor.getPasscode()).isEqualTo("guest"); assertThat(stompAccessor.getHeartbeat()).isEqualTo(new long[] {10000, 10000}); assertThat(stompAccessor.getAcceptVersion()).isEqualTo(new HashSet<>(Arrays.asList("1.1","1.0"))); - assertThat(this.session.getSentMessages().size()).isEqualTo(0); + assertThat(this.session.getSentMessages()).hasSize(0); } @Test @@ -393,7 +393,7 @@ public class StompSubProtocolHandlerTests { TextMessage wsMessage = StompTextMessageBuilder.create(StompCommand.CONNECT).build(); handler.handleMessageFromClient(this.session, wsMessage, channel); - assertThat(messageHandler.getMessages().size()).isEqualTo(1); + assertThat(messageHandler.getMessages()).hasSize(1); Message message = messageHandler.getMessages().get(0); Principal user = SimpMessageHeaderAccessor.getUser(message.getHeaders()); assertThat(user).isNotNull(); @@ -420,7 +420,7 @@ public class StompSubProtocolHandlerTests { this.protocolHandler.handleMessageFromClient(this.session, textMessage, this.channel); verifyNoInteractions(this.channel); - assertThat(this.session.getSentMessages().size()).isEqualTo(1); + assertThat(this.session.getSentMessages()).hasSize(1); TextMessage actual = (TextMessage) this.session.getSentMessages().get(0); assertThat(actual.getPayload().startsWith("ERROR")).isTrue(); } @@ -483,7 +483,7 @@ public class StompSubProtocolHandlerTests { message = MessageBuilder.createMessage(EMPTY_PAYLOAD, headers.getMessageHeaders()); this.protocolHandler.handleMessageToClient(this.session, message); - assertThat(this.session.getSentMessages().size()).isEqualTo(1); + assertThat(this.session.getSentMessages()).hasSize(1); textMessage = (TextMessage) this.session.getSentMessages().get(0); assertThat(textMessage.getPayload()).isEqualTo(""" CONNECTED diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/server/support/HttpSessionHandshakeInterceptorTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/server/support/HttpSessionHandshakeInterceptorTests.java index eaae7851dc4..1359862f74a 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/server/support/HttpSessionHandshakeInterceptorTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/server/support/HttpSessionHandshakeInterceptorTests.java @@ -50,7 +50,7 @@ public class HttpSessionHandshakeInterceptorTests extends AbstractHttpRequestTes HttpSessionHandshakeInterceptor interceptor = new HttpSessionHandshakeInterceptor(); interceptor.beforeHandshake(this.request, this.response, wsHandler, attributes); - assertThat(attributes.size()).isEqualTo(3); + assertThat(attributes).hasSize(3); assertThat(attributes.get("foo")).isEqualTo("bar"); assertThat(attributes.get("bar")).isEqualTo("baz"); assertThat(attributes.get(HttpSessionHandshakeInterceptor.HTTP_SESSION_ID_ATTR_NAME)).isEqualTo("123"); @@ -66,7 +66,7 @@ public class HttpSessionHandshakeInterceptorTests extends AbstractHttpRequestTes HttpSessionHandshakeInterceptor interceptor = new HttpSessionHandshakeInterceptor(names); interceptor.beforeHandshake(this.request, this.response, wsHandler, attributes); - assertThat(attributes.size()).isEqualTo(2); + assertThat(attributes).hasSize(2); assertThat(attributes.get("foo")).isEqualTo("bar"); assertThat(attributes.get(HttpSessionHandshakeInterceptor.HTTP_SESSION_ID_ATTR_NAME)).isEqualTo("123"); } @@ -80,7 +80,7 @@ public class HttpSessionHandshakeInterceptorTests extends AbstractHttpRequestTes interceptor.setCopyHttpSessionId(false); interceptor.beforeHandshake(this.request, this.response, wsHandler, attributes); - assertThat(attributes.size()).isEqualTo(1); + assertThat(attributes).hasSize(1); assertThat(attributes.get("foo")).isEqualTo("bar"); } @@ -94,7 +94,7 @@ public class HttpSessionHandshakeInterceptorTests extends AbstractHttpRequestTes interceptor.setCopyAllAttributes(false); interceptor.beforeHandshake(this.request, this.response, wsHandler, attributes); - assertThat(attributes.size()).isEqualTo(1); + assertThat(attributes).hasSize(1); assertThat(attributes.get(HttpSessionHandshakeInterceptor.HTTP_SESSION_ID_ATTR_NAME)).isEqualTo("123"); } diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/SockJsClientTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/SockJsClientTests.java index 48c9749dd79..acd994261a8 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/SockJsClientTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/SockJsClientTests.java @@ -115,12 +115,12 @@ class SockJsClientTests { this.sockJsClient.doHandshake(handler, headers, new URI(URL)).addCallback(this.connectCallback); HttpHeaders httpHeaders = headersCaptor.getValue(); - assertThat(httpHeaders.size()).isEqualTo(2); + assertThat(httpHeaders).hasSize(2); assertThat(httpHeaders.getFirst("foo")).isEqualTo("bar"); assertThat(httpHeaders.getFirst("auth")).isEqualTo("123"); httpHeaders = this.xhrTransport.getRequest().getHttpRequestHeaders(); - assertThat(httpHeaders.size()).isEqualTo(2); + assertThat(httpHeaders).hasSize(2); assertThat(httpHeaders.getFirst("foo")).isEqualTo("bar"); assertThat(httpHeaders.getFirst("auth")).isEqualTo("123"); } @@ -137,9 +137,9 @@ class SockJsClientTests { this.sockJsClient.setHttpHeaderNames("auth"); this.sockJsClient.doHandshake(handler, headers, new URI(URL)).addCallback(this.connectCallback); - assertThat(headersCaptor.getValue().size()).isEqualTo(1); + assertThat(headersCaptor.getValue()).hasSize(1); assertThat(headersCaptor.getValue().getFirst("auth")).isEqualTo("123"); - assertThat(this.xhrTransport.getRequest().getHttpRequestHeaders().size()).isEqualTo(1); + assertThat(this.xhrTransport.getRequest().getHttpRequestHeaders()).hasSize(1); assertThat(this.xhrTransport.getRequest().getHttpRequestHeaders().getFirst("auth")).isEqualTo("123"); } diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/XhrTransportTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/XhrTransportTests.java index ee5afedc129..3685119be39 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/XhrTransportTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/XhrTransportTests.java @@ -69,7 +69,7 @@ class XhrTransportTests { transport.sendMessageResponseToReturn = new ResponseEntity<>(HttpStatus.NO_CONTENT); URI url = new URI("https://example.com"); transport.executeSendRequest(url, requestHeaders, new TextMessage("payload")); - assertThat(transport.actualSendRequestHeaders.size()).isEqualTo(2); + assertThat(transport.actualSendRequestHeaders).hasSize(2); assertThat(transport.actualSendRequestHeaders.getFirst("foo")).isEqualTo("bar"); assertThat(transport.actualSendRequestHeaders.getContentType()).isEqualTo(MediaType.APPLICATION_JSON); } @@ -106,7 +106,7 @@ class XhrTransportTests { verify(request).getHttpRequestHeaders(); verifyNoMoreInteractions(request); - assertThat(transport.actualHandshakeHeaders.size()).isEqualTo(1); + assertThat(transport.actualHandshakeHeaders).hasSize(1); assertThat(transport.actualHandshakeHeaders.getOrigin()).isEqualTo("foo"); assertThat(transport.actualSession.isDisconnected()).isFalse(); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsServiceTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsServiceTests.java index 423a0ef7f9f..4489c2eb791 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsServiceTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsServiceTests.java @@ -111,7 +111,7 @@ public class DefaultSockJsServiceTests extends AbstractHttpRequestTests { DefaultSockJsService service = new DefaultSockJsService(mock(TaskScheduler.class)); Map handlers = service.getTransportHandlers(); - assertThat(handlers.size()).isEqualTo(6); + assertThat(handlers).hasSize(6); assertThat(handlers.get(TransportType.WEBSOCKET)).isNotNull(); assertThat(handlers.get(TransportType.XHR)).isNotNull(); assertThat(handlers.get(TransportType.XHR_SEND)).isNotNull(); @@ -127,7 +127,7 @@ public class DefaultSockJsServiceTests extends AbstractHttpRequestTests { DefaultSockJsService service = new DefaultSockJsService(mock(TaskScheduler.class), xhrHandler); Map handlers = service.getTransportHandlers(); - assertThat(handlers.size()).isEqualTo(6); + assertThat(handlers).hasSize(6); assertThat(handlers.get(xhrHandler.getTransportType())).isSameAs(xhrHandler); } @@ -143,7 +143,7 @@ public class DefaultSockJsServiceTests extends AbstractHttpRequestTests { mock(TaskScheduler.class), new XhrPollingTransportHandler(), new XhrReceivingTransportHandler()); Map actualHandlers = service.getTransportHandlers(); - assertThat(actualHandlers.size()).isEqualTo(2); + assertThat(actualHandlers).hasSize(2); } @Test diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/SockJsSessionTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/SockJsSessionTests.java index f0199951a66..a7afe2777fb 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/SockJsSessionTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/SockJsSessionTests.java @@ -186,7 +186,7 @@ class SockJsSessionTests extends AbstractSockJsSessionTests { this.session.setActive(true); this.session.close(); - assertThat(this.session.getSockJsFramesWritten().size()).isEqualTo(1); + assertThat(this.session.getSockJsFramesWritten()).hasSize(1); assertThat(this.session.getSockJsFramesWritten().get(0)).isEqualTo(SockJsFrame.closeFrameGoAway()); assertThat(this.session.getNumberOfLastActiveTimeUpdates()).isEqualTo(1); @@ -235,7 +235,7 @@ class SockJsSessionTests extends AbstractSockJsSessionTests { void writeFrame() { this.session.writeFrame(SockJsFrame.openFrame()); - assertThat(this.session.getSockJsFramesWritten().size()).isEqualTo(1); + assertThat(this.session.getSockJsFramesWritten()).hasSize(1); assertThat(this.session.getSockJsFramesWritten().get(0)).isEqualTo(SockJsFrame.openFrame()); } @@ -255,7 +255,7 @@ class SockJsSessionTests extends AbstractSockJsSessionTests { this.session.setActive(true); this.session.sendHeartbeat(); - assertThat(this.session.getSockJsFramesWritten().size()).isEqualTo(1); + assertThat(this.session.getSockJsFramesWritten()).hasSize(1); assertThat(this.session.getSockJsFramesWritten().get(0)).isEqualTo(SockJsFrame.heartbeatFrame()); verify(this.taskScheduler).schedule(any(Runnable.class), any(Instant.class));