Skip to content

Commit 36f7597

Browse files
sbrannensbrannen
committed
Use AssertJ's hasSize() for collections and maps
Achieved via a global search-and-replace.
1 parent f9f8f2d commit 36f7597

File tree

237 files changed

+1161
-1172
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

237 files changed

+1161
-1172
lines changed

‎spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ void introductionAdvisorExcludedFromTargetImplementingInterface() {
366366
new SingletonMetadataAwareAspectInstanceFactory(new MakeLockable(), "someBean")),
367367
CannotBeUnlocked.class).isEmpty()).isTrue();
368368
assertThat(AopUtils.findAdvisorsThatCanApply(getFixture().getAdvisors(
369-
new SingletonMetadataAwareAspectInstanceFactory(new MakeLockable(),"someBean")), NotLockable.class).size()).isEqualTo(2);
369+
new SingletonMetadataAwareAspectInstanceFactory(new MakeLockable(),"someBean")), NotLockable.class)).hasSize(2);
370370
}
371371

372372
@Test

‎spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,11 +1010,11 @@ void setCollectionPropertyNonMatchingType() {
10101010
accessor.setPropertyValue("list", list);
10111011
assertThat(target.getCollection()).hasSize(1);
10121012
assertThat(target.getCollection().containsAll(coll)).isTrue();
1013-
assertThat(target.getSet().size()).isEqualTo(1);
1013+
assertThat(target.getSet()).hasSize(1);
10141014
assertThat(target.getSet().containsAll(set)).isTrue();
1015-
assertThat(target.getSortedSet().size()).isEqualTo(1);
1015+
assertThat(target.getSortedSet()).hasSize(1);
10161016
assertThat(target.getSortedSet().containsAll(sortedSet)).isTrue();
1017-
assertThat(target.getList().size()).isEqualTo(1);
1017+
assertThat(target.getList()).hasSize(1);
10181018
assertThat(target.getList().containsAll(list)).isTrue();
10191019
}
10201020

@@ -1037,11 +1037,11 @@ void setCollectionPropertyWithArrayValue() {
10371037
accessor.setPropertyValue("list", list.toArray());
10381038
assertThat(target.getCollection()).hasSize(1);
10391039
assertThat(target.getCollection().containsAll(coll)).isTrue();
1040-
assertThat(target.getSet().size()).isEqualTo(1);
1040+
assertThat(target.getSet()).hasSize(1);
10411041
assertThat(target.getSet().containsAll(set)).isTrue();
1042-
assertThat(target.getSortedSet().size()).isEqualTo(1);
1042+
assertThat(target.getSortedSet()).hasSize(1);
10431043
assertThat(target.getSortedSet().containsAll(sortedSet)).isTrue();
1044-
assertThat(target.getList().size()).isEqualTo(1);
1044+
assertThat(target.getList()).hasSize(1);
10451045
assertThat(target.getList().containsAll(list)).isTrue();
10461046
}
10471047

@@ -1064,11 +1064,11 @@ void setCollectionPropertyWithIntArrayValue() {
10641064
accessor.setPropertyValue("list", new int[]{3});
10651065
assertThat(target.getCollection()).hasSize(1);
10661066
assertThat(target.getCollection().containsAll(coll)).isTrue();
1067-
assertThat(target.getSet().size()).isEqualTo(1);
1067+
assertThat(target.getSet()).hasSize(1);
10681068
assertThat(target.getSet().containsAll(set)).isTrue();
1069-
assertThat(target.getSortedSet().size()).isEqualTo(1);
1069+
assertThat(target.getSortedSet()).hasSize(1);
10701070
assertThat(target.getSortedSet().containsAll(sortedSet)).isTrue();
1071-
assertThat(target.getList().size()).isEqualTo(1);
1071+
assertThat(target.getList()).hasSize(1);
10721072
assertThat(target.getList().containsAll(list)).isTrue();
10731073
}
10741074

@@ -1091,11 +1091,11 @@ void setCollectionPropertyWithIntegerValue() {
10911091
accessor.setPropertyValue("list", 3);
10921092
assertThat(target.getCollection()).hasSize(1);
10931093
assertThat(target.getCollection().containsAll(coll)).isTrue();
1094-
assertThat(target.getSet().size()).isEqualTo(1);
1094+
assertThat(target.getSet()).hasSize(1);
10951095
assertThat(target.getSet().containsAll(set)).isTrue();
1096-
assertThat(target.getSortedSet().size()).isEqualTo(1);
1096+
assertThat(target.getSortedSet()).hasSize(1);
10971097
assertThat(target.getSortedSet().containsAll(sortedSet)).isTrue();
1098-
assertThat(target.getList().size()).isEqualTo(1);
1098+
assertThat(target.getList()).hasSize(1);
10991099
assertThat(target.getList().containsAll(list)).isTrue();
11001100
}
11011101

@@ -1113,15 +1113,16 @@ void setCollectionPropertyWithStringValue() {
11131113
Set<String> list = new HashSet<>();
11141114
list.add("list1");
11151115
accessor.setPropertyValue("list", "list1");
1116-
assertThat(target.getSet().size()).isEqualTo(1);
1116+
assertThat(target.getSet()).hasSize(1);
11171117
assertThat(target.getSet().containsAll(set)).isTrue();
1118-
assertThat(target.getSortedSet().size()).isEqualTo(1);
1118+
assertThat(target.getSortedSet()).hasSize(1);
11191119
assertThat(target.getSortedSet().containsAll(sortedSet)).isTrue();
1120-
assertThat(target.getList().size()).isEqualTo(1);
1120+
assertThat(target.getList()).hasSize(1);
11211121
assertThat(target.getList().containsAll(list)).isTrue();
11221122
}
11231123

11241124
@Test
1125+
@SuppressWarnings("unchecked")
11251126
void setCollectionPropertyWithStringValueAndCustomEditor() {
11261127
IndexedTestBean target = new IndexedTestBean();
11271128
AbstractPropertyAccessor accessor = createAccessor(target);
@@ -1131,11 +1132,11 @@ void setCollectionPropertyWithStringValueAndCustomEditor() {
11311132
accessor.setPropertyValue("set", "set1 ");
11321133
accessor.setPropertyValue("sortedSet", "sortedSet1");
11331134
accessor.setPropertyValue("list", "list1 ");
1134-
assertThat(target.getSet().size()).isEqualTo(1);
1135+
assertThat(target.getSet()).hasSize(1);
11351136
assertThat(target.getSet().contains("set1")).isTrue();
1136-
assertThat(target.getSortedSet().size()).isEqualTo(1);
1137+
assertThat(target.getSortedSet()).hasSize(1);
11371138
assertThat(target.getSortedSet().contains("sortedSet1")).isTrue();
1138-
assertThat(target.getList().size()).isEqualTo(1);
1139+
assertThat(target.getList()).hasSize(1);
11391140
assertThat(target.getList().contains("list1")).isTrue();
11401141

11411142
accessor.setPropertyValue("list", Collections.singletonList("list1 "));
@@ -1169,7 +1170,7 @@ void setMapPropertyNonMatchingType() {
11691170
accessor.setPropertyValue("sortedMap", sortedMap);
11701171
assertThat(target.getMap()).hasSize(1);
11711172
assertThat(target.getMap().get("key")).isEqualTo("value");
1172-
assertThat(target.getSortedMap().size()).isEqualTo(1);
1173+
assertThat(target.getSortedMap()).hasSize(1);
11731174
assertThat(target.getSortedMap().get("sortedKey")).isEqualTo("sortedValue");
11741175
}
11751176

‎spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public void setPropertyValueAutoGrow3dArray() {
125125
@Test
126126
public void getPropertyValueAutoGrowList() {
127127
assertNotNull(wrapper.getPropertyValue("list[0]"));
128-
assertThat(bean.getList().size()).isEqualTo(1);
128+
assertThat(bean.getList()).hasSize(1);
129129
assertThat(bean.getList().get(0)).isInstanceOf(Bean.class);
130130
}
131131

@@ -138,7 +138,7 @@ public void setPropertyValueAutoGrowList() {
138138
@Test
139139
public void getPropertyValueAutoGrowListBySeveralElements() {
140140
assertNotNull(wrapper.getPropertyValue("list[4]"));
141-
assertThat(bean.getList().size()).isEqualTo(5);
141+
assertThat(bean.getList()).hasSize(5);
142142
assertThat(bean.getList().get(0)).isInstanceOf(Bean.class);
143143
assertThat(bean.getList().get(1)).isInstanceOf(Bean.class);
144144
assertThat(bean.getList().get(2)).isInstanceOf(Bean.class);
@@ -161,7 +161,7 @@ public void getPropertyValueAutoGrowListFailsAgainstLimit() {
161161
@Test
162162
public void getPropertyValueAutoGrowMultiDimensionalList() {
163163
assertNotNull(wrapper.getPropertyValue("multiList[0][0]"));
164-
assertThat(bean.getMultiList().get(0).size()).isEqualTo(1);
164+
assertThat(bean.getMultiList().get(0)).hasSize(1);
165165
assertThat(bean.getMultiList().get(0).get(0)).isInstanceOf(Bean.class);
166166
}
167167

‎spring-beans/src/test/java/org/springframework/beans/BeanWrapperEnumTests.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public void testCustomEnumSetWithSingleValue() {
9191
GenericBean<?> gb = new GenericBean<>();
9292
BeanWrapper bw = new BeanWrapperImpl(gb);
9393
bw.setPropertyValue("customEnumSet", "VALUE_1");
94-
assertThat(gb.getCustomEnumSet().size()).isEqualTo(1);
94+
assertThat(gb.getCustomEnumSet()).hasSize(1);
9595
assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_1)).isTrue();
9696
}
9797

@@ -100,7 +100,7 @@ public void testCustomEnumSetWithMultipleValues() {
100100
GenericBean<?> gb = new GenericBean<>();
101101
BeanWrapper bw = new BeanWrapperImpl(gb);
102102
bw.setPropertyValue("customEnumSet", new String[] {"VALUE_1", "VALUE_2"});
103-
assertThat(gb.getCustomEnumSet().size()).isEqualTo(2);
103+
assertThat(gb.getCustomEnumSet()).hasSize(2);
104104
assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_1)).isTrue();
105105
assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_2)).isTrue();
106106
}
@@ -110,7 +110,7 @@ public void testCustomEnumSetWithMultipleValuesAsCsv() {
110110
GenericBean<?> gb = new GenericBean<>();
111111
BeanWrapper bw = new BeanWrapperImpl(gb);
112112
bw.setPropertyValue("customEnumSet", "VALUE_1,VALUE_2");
113-
assertThat(gb.getCustomEnumSet().size()).isEqualTo(2);
113+
assertThat(gb.getCustomEnumSet()).hasSize(2);
114114
assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_1)).isTrue();
115115
assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_2)).isTrue();
116116
}
@@ -120,7 +120,7 @@ public void testCustomEnumSetWithGetterSetterMismatch() {
120120
GenericBean<?> gb = new GenericBean<>();
121121
BeanWrapper bw = new BeanWrapperImpl(gb);
122122
bw.setPropertyValue("customEnumSetMismatch", new String[] {"VALUE_1", "VALUE_2"});
123-
assertThat(gb.getCustomEnumSet().size()).isEqualTo(2);
123+
assertThat(gb.getCustomEnumSet()).hasSize(2);
124124
assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_1)).isTrue();
125125
assertThat(gb.getCustomEnumSet().contains(CustomEnum.VALUE_2)).isTrue();
126126
}
@@ -132,7 +132,7 @@ public void testStandardEnumSetWithMultipleValues() {
132132
bw.setConversionService(new DefaultConversionService());
133133
assertThat(gb.getStandardEnumSet()).isNull();
134134
bw.setPropertyValue("standardEnumSet", new String[] {"VALUE_1", "VALUE_2"});
135-
assertThat(gb.getStandardEnumSet().size()).isEqualTo(2);
135+
assertThat(gb.getStandardEnumSet()).hasSize(2);
136136
assertThat(gb.getStandardEnumSet().contains(CustomEnum.VALUE_1)).isTrue();
137137
assertThat(gb.getStandardEnumSet().contains(CustomEnum.VALUE_2)).isTrue();
138138
}
@@ -144,7 +144,7 @@ public void testStandardEnumSetWithAutoGrowing() {
144144
bw.setAutoGrowNestedPaths(true);
145145
assertThat(gb.getStandardEnumSet()).isNull();
146146
bw.getPropertyValue("standardEnumSet.class");
147-
assertThat(gb.getStandardEnumSet().size()).isEqualTo(0);
147+
assertThat(gb.getStandardEnumSet()).hasSize(0);
148148
}
149149

150150
@Test
@@ -157,7 +157,7 @@ public void testStandardEnumMapWithMultipleValues() {
157157
map.put("VALUE_1", 1);
158158
map.put("VALUE_2", 2);
159159
bw.setPropertyValue("standardEnumMap", map);
160-
assertThat(gb.getStandardEnumMap().size()).isEqualTo(2);
160+
assertThat(gb.getStandardEnumMap()).hasSize(2);
161161
assertThat(gb.getStandardEnumMap().get(CustomEnum.VALUE_1)).isEqualTo(1);
162162
assertThat(gb.getStandardEnumMap().get(CustomEnum.VALUE_2)).isEqualTo(2);
163163
}
@@ -169,7 +169,7 @@ public void testStandardEnumMapWithAutoGrowing() {
169169
bw.setAutoGrowNestedPaths(true);
170170
assertThat(gb.getStandardEnumMap()).isNull();
171171
bw.setPropertyValue("standardEnumMap[VALUE_1]", 1);
172-
assertThat(gb.getStandardEnumMap().size()).isEqualTo(1);
172+
assertThat(gb.getStandardEnumMap()).hasSize(1);
173173
assertThat(gb.getStandardEnumMap().get(CustomEnum.VALUE_1)).isEqualTo(1);
174174
}
175175

‎spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,14 @@ public void testHierarchicalCountBeansWithOverride() {
103103
public void testHierarchicalNamesWithNoMatch() {
104104
List<String> names = Arrays.asList(
105105
BeanFactoryUtils.beanNamesForTypeIncludingAncestors(this.listableBeanFactory, NoOp.class));
106-
assertThat(names.size()).isEqualTo(0);
106+
assertThat(names).hasSize(0);
107107
}
108108

109109
@Test
110110
public void testHierarchicalNamesWithMatchOnlyInRoot() {
111111
List<String> names = Arrays.asList(
112112
BeanFactoryUtils.beanNamesForTypeIncludingAncestors(this.listableBeanFactory, IndexedTestBean.class));
113-
assertThat(names.size()).isEqualTo(1);
113+
assertThat(names).hasSize(1);
114114
assertThat(names.contains("indexedBean")).isTrue();
115115
// Distinguish from default ListableBeanFactory behavior
116116
assertThat(listableBeanFactory.getBeanNamesForType(IndexedTestBean.class).length == 0).isTrue();
@@ -121,7 +121,7 @@ public void testGetBeanNamesForTypeWithOverride() {
121121
List<String> names = Arrays.asList(
122122
BeanFactoryUtils.beanNamesForTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class));
123123
// includes 2 TestBeans from FactoryBeans (DummyFactory definitions)
124-
assertThat(names.size()).isEqualTo(4);
124+
assertThat(names).hasSize(4);
125125
assertThat(names.contains("test")).isTrue();
126126
assertThat(names.contains("test3")).isTrue();
127127
assertThat(names.contains("testFactory1")).isTrue();
@@ -150,20 +150,20 @@ public void testFindsBeansOfTypeWithStaticFactory() {
150150
lbf.addBean("t4", t4);
151151

152152
Map<String, ?> beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(lbf, ITestBean.class, true, true);
153-
assertThat(beans.size()).isEqualTo(4);
153+
assertThat(beans).hasSize(4);
154154
assertThat(beans.get("t1")).isEqualTo(t1);
155155
assertThat(beans.get("t2")).isEqualTo(t2);
156156
assertThat(beans.get("t3")).isEqualTo(t3.getObject());
157157
boolean condition = beans.get("t4") instanceof TestBean;
158158
assertThat(condition).isTrue();
159159

160160
beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(lbf, DummyFactory.class, true, true);
161-
assertThat(beans.size()).isEqualTo(2);
161+
assertThat(beans).hasSize(2);
162162
assertThat(beans.get("&t3")).isEqualTo(t3);
163163
assertThat(beans.get("&t4")).isEqualTo(t4);
164164

165165
beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(lbf, FactoryBean.class, true, true);
166-
assertThat(beans.size()).isEqualTo(2);
166+
assertThat(beans).hasSize(2);
167167
assertThat(beans.get("&t3")).isEqualTo(t3);
168168
assertThat(beans.get("&t4")).isEqualTo(t4);
169169
}
@@ -185,7 +185,7 @@ public void testFindsBeansOfTypeWithDefaultFactory() {
185185

186186
Map<String, ?> beans =
187187
BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class, true, false);
188-
assertThat(beans.size()).isEqualTo(6);
188+
assertThat(beans).hasSize(6);
189189
assertThat(beans.get("test3")).isEqualTo(test3);
190190
assertThat(beans.get("test")).isEqualTo(test);
191191
assertThat(beans.get("t1")).isEqualTo(t1);
@@ -199,15 +199,15 @@ public void testFindsBeansOfTypeWithDefaultFactory() {
199199

200200
beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class, false, true);
201201
Object testFactory1 = this.listableBeanFactory.getBean("testFactory1");
202-
assertThat(beans.size()).isEqualTo(5);
202+
assertThat(beans).hasSize(5);
203203
assertThat(beans.get("test")).isEqualTo(test);
204204
assertThat(beans.get("testFactory1")).isEqualTo(testFactory1);
205205
assertThat(beans.get("t1")).isEqualTo(t1);
206206
assertThat(beans.get("t2")).isEqualTo(t2);
207207
assertThat(beans.get("t3")).isEqualTo(t3.getObject());
208208

209209
beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class, true, true);
210-
assertThat(beans.size()).isEqualTo(8);
210+
assertThat(beans).hasSize(8);
211211
assertThat(beans.get("test3")).isEqualTo(test3);
212212
assertThat(beans.get("test")).isEqualTo(test);
213213
assertThat(beans.get("testFactory1")).isEqualTo(testFactory1);
@@ -220,14 +220,14 @@ public void testFindsBeansOfTypeWithDefaultFactory() {
220220
assertThat(condition).isTrue();
221221

222222
beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, DummyFactory.class, true, true);
223-
assertThat(beans.size()).isEqualTo(4);
223+
assertThat(beans).hasSize(4);
224224
assertThat(beans.get("&testFactory1")).isEqualTo(this.listableBeanFactory.getBean("&testFactory1"));
225225
assertThat(beans.get("&testFactory2")).isEqualTo(this.listableBeanFactory.getBean("&testFactory2"));
226226
assertThat(beans.get("&t3")).isEqualTo(t3);
227227
assertThat(beans.get("&t4")).isEqualTo(t4);
228228

229229
beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, FactoryBean.class, true, true);
230-
assertThat(beans.size()).isEqualTo(4);
230+
assertThat(beans).hasSize(4);
231231
assertThat(beans.get("&testFactory1")).isEqualTo(this.listableBeanFactory.getBean("&testFactory1"));
232232
assertThat(beans.get("&testFactory2")).isEqualTo(this.listableBeanFactory.getBean("&testFactory2"));
233233
assertThat(beans.get("&t3")).isEqualTo(t3);
@@ -241,35 +241,35 @@ public void testHierarchicalResolutionWithOverride() {
241241

242242
Map<String, ?> beans =
243243
BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class, true, false);
244-
assertThat(beans.size()).isEqualTo(2);
244+
assertThat(beans).hasSize(2);
245245
assertThat(beans.get("test3")).isEqualTo(test3);
246246
assertThat(beans.get("test")).isEqualTo(test);
247247

248248
beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class, false, false);
249-
assertThat(beans.size()).isEqualTo(1);
249+
assertThat(beans).hasSize(1);
250250
assertThat(beans.get("test")).isEqualTo(test);
251251

252252
beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class, false, true);
253253
Object testFactory1 = this.listableBeanFactory.getBean("testFactory1");
254-
assertThat(beans.size()).isEqualTo(2);
254+
assertThat(beans).hasSize(2);
255255
assertThat(beans.get("test")).isEqualTo(test);
256256
assertThat(beans.get("testFactory1")).isEqualTo(testFactory1);
257257

258258
beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class, true, true);
259-
assertThat(beans.size()).isEqualTo(4);
259+
assertThat(beans).hasSize(4);
260260
assertThat(beans.get("test3")).isEqualTo(test3);
261261
assertThat(beans.get("test")).isEqualTo(test);
262262
assertThat(beans.get("testFactory1")).isEqualTo(testFactory1);
263263
boolean condition = beans.get("testFactory2") instanceof TestBean;
264264
assertThat(condition).isTrue();
265265

266266
beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, DummyFactory.class, true, true);
267-
assertThat(beans.size()).isEqualTo(2);
267+
assertThat(beans).hasSize(2);
268268
assertThat(beans.get("&testFactory1")).isEqualTo(this.listableBeanFactory.getBean("&testFactory1"));
269269
assertThat(beans.get("&testFactory2")).isEqualTo(this.listableBeanFactory.getBean("&testFactory2"));
270270

271271
beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, FactoryBean.class, true, true);
272-
assertThat(beans.size()).isEqualTo(2);
272+
assertThat(beans).hasSize(2);
273273
assertThat(beans.get("&testFactory1")).isEqualTo(this.listableBeanFactory.getBean("&testFactory1"));
274274
assertThat(beans.get("&testFactory2")).isEqualTo(this.listableBeanFactory.getBean("&testFactory2"));
275275
}
@@ -278,14 +278,14 @@ public void testHierarchicalResolutionWithOverride() {
278278
public void testHierarchicalNamesForAnnotationWithNoMatch() {
279279
List<String> names = Arrays.asList(
280280
BeanFactoryUtils.beanNamesForAnnotationIncludingAncestors(this.listableBeanFactory, Override.class));
281-
assertThat(names.size()).isEqualTo(0);
281+
assertThat(names).hasSize(0);
282282
}
283283

284284
@Test
285285
public void testHierarchicalNamesForAnnotationWithMatchOnlyInRoot() {
286286
List<String> names = Arrays.asList(
287287
BeanFactoryUtils.beanNamesForAnnotationIncludingAncestors(this.listableBeanFactory, TestAnnotation.class));
288-
assertThat(names.size()).isEqualTo(1);
288+
assertThat(names).hasSize(1);
289289
assertThat(names.contains("annotatedBean")).isTrue();
290290
// Distinguish from default ListableBeanFactory behavior
291291
assertThat(listableBeanFactory.getBeanNamesForAnnotation(TestAnnotation.class).length == 0).isTrue();
@@ -297,7 +297,7 @@ public void testGetBeanNamesForAnnotationWithOverride() {
297297
this.listableBeanFactory.registerSingleton("anotherAnnotatedBean", annotatedBean);
298298
List<String> names = Arrays.asList(
299299
BeanFactoryUtils.beanNamesForAnnotationIncludingAncestors(this.listableBeanFactory, TestAnnotation.class));
300-
assertThat(names.size()).isEqualTo(2);
300+
assertThat(names).hasSize(2);
301301
assertThat(names.contains("annotatedBean")).isTrue();
302302
assertThat(names.contains("anotherAnnotatedBean")).isTrue();
303303
}

0 commit comments

Comments
 (0)