Skip to content

Commit d5b0b2b

Browse files
sbrannensbrannen
committed
User AssertJ's hasSize() for arrays
Achieved via global search-and-replace.
1 parent 36f7597 commit d5b0b2b

File tree

72 files changed

+277
-277
lines changed

Some content is hidden

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

72 files changed

+277
-277
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ void perThisAspect() throws Exception {
195195

196196
Advised advised = (Advised) itb;
197197
// Will be ExposeInvocationInterceptor, synthetic instantiation advisor, 2 method advisors
198-
assertThat(advised.getAdvisors().length).isEqualTo(4);
198+
assertThat(advised.getAdvisors()).hasSize(4);
199199
ReflectiveAspectJAdvisorFactory.SyntheticInstantiationAdvisor sia =
200200
(ReflectiveAspectJAdvisorFactory.SyntheticInstantiationAdvisor) advised.getAdvisors()[1];
201201
assertThat(sia.getPointcut().getMethodMatcher().matches(TestBean.class.getMethod("getSpouse"), null)).isTrue();
@@ -231,7 +231,7 @@ void perTypeWithinAspect() throws Exception {
231231

232232
Advised advised = (Advised) itb;
233233
// Will be ExposeInvocationInterceptor, synthetic instantiation advisor, 2 method advisors
234-
assertThat(advised.getAdvisors().length).isEqualTo(4);
234+
assertThat(advised.getAdvisors()).hasSize(4);
235235
ReflectiveAspectJAdvisorFactory.SyntheticInstantiationAdvisor sia =
236236
(ReflectiveAspectJAdvisorFactory.SyntheticInstantiationAdvisor) advised.getAdvisors()[1];
237237
assertThat(sia.getPointcut().getMethodMatcher().matches(TestBean.class.getMethod("getSpouse"), null)).isTrue();

‎spring-aop/src/test/java/org/springframework/aop/support/AbstractRegexpMethodPointcutTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void testSerializationWithNoPatternSupplied() throws Exception {
5656
protected void noPatternSuppliedTests(AbstractRegexpMethodPointcut rpc) throws Exception {
5757
assertThat(rpc.matches(Object.class.getMethod("hashCode"), String.class)).isFalse();
5858
assertThat(rpc.matches(Object.class.getMethod("wait"), Object.class)).isFalse();
59-
assertThat(rpc.getPatterns().length).isEqualTo(0);
59+
assertThat(rpc.getPatterns()).hasSize(0);
6060
}
6161

6262
@Test

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void getPropertyValueNullValueInNestedPathNoDefaultConstructor() {
6363
@Test
6464
public void getPropertyValueAutoGrowArray() {
6565
assertNotNull(wrapper.getPropertyValue("array[0]"));
66-
assertThat(bean.getArray().length).isEqualTo(1);
66+
assertThat(bean.getArray()).hasSize(1);
6767
assertThat(bean.getArray()[0]).isInstanceOf(Bean.class);
6868
}
6969

@@ -76,7 +76,7 @@ public void setPropertyValueAutoGrowArray() {
7676
@Test
7777
public void getPropertyValueAutoGrowArrayBySeveralElements() {
7878
assertNotNull(wrapper.getPropertyValue("array[4]"));
79-
assertThat(bean.getArray().length).isEqualTo(5);
79+
assertThat(bean.getArray()).hasSize(5);
8080
assertThat(bean.getArray()[0]).isInstanceOf(Bean.class);
8181
assertThat(bean.getArray()[1]).isInstanceOf(Bean.class);
8282
assertThat(bean.getArray()[2]).isInstanceOf(Bean.class);
@@ -91,7 +91,7 @@ public void getPropertyValueAutoGrowArrayBySeveralElements() {
9191
@Test
9292
public void getPropertyValueAutoGrow2dArray() {
9393
assertNotNull(wrapper.getPropertyValue("multiArray[0][0]"));
94-
assertThat(bean.getMultiArray()[0].length).isEqualTo(1);
94+
assertThat(bean.getMultiArray()[0]).hasSize(1);
9595
assertThat(bean.getMultiArray()[0][0]).isInstanceOf(Bean.class);
9696
}
9797

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public void testCustomEnumArrayWithSingleValue() {
6262
GenericBean<?> gb = new GenericBean<>();
6363
BeanWrapper bw = new BeanWrapperImpl(gb);
6464
bw.setPropertyValue("customEnumArray", "VALUE_1");
65-
assertThat(gb.getCustomEnumArray().length).isEqualTo(1);
65+
assertThat(gb.getCustomEnumArray()).hasSize(1);
6666
assertThat(gb.getCustomEnumArray()[0]).isEqualTo(CustomEnum.VALUE_1);
6767
}
6868

@@ -71,7 +71,7 @@ public void testCustomEnumArrayWithMultipleValues() {
7171
GenericBean<?> gb = new GenericBean<>();
7272
BeanWrapper bw = new BeanWrapperImpl(gb);
7373
bw.setPropertyValue("customEnumArray", new String[] {"VALUE_1", "VALUE_2"});
74-
assertThat(gb.getCustomEnumArray().length).isEqualTo(2);
74+
assertThat(gb.getCustomEnumArray()).hasSize(2);
7575
assertThat(gb.getCustomEnumArray()[0]).isEqualTo(CustomEnum.VALUE_1);
7676
assertThat(gb.getCustomEnumArray()[1]).isEqualTo(CustomEnum.VALUE_2);
7777
}
@@ -81,7 +81,7 @@ public void testCustomEnumArrayWithMultipleValuesAsCsv() {
8181
GenericBean<?> gb = new GenericBean<>();
8282
BeanWrapper bw = new BeanWrapperImpl(gb);
8383
bw.setPropertyValue("customEnumArray", "VALUE_1,VALUE_2");
84-
assertThat(gb.getCustomEnumArray().length).isEqualTo(2);
84+
assertThat(gb.getCustomEnumArray()).hasSize(2);
8585
assertThat(gb.getCustomEnumArray()[0]).isEqualTo(CustomEnum.VALUE_1);
8686
assertThat(gb.getCustomEnumArray()[1]).isEqualTo(CustomEnum.VALUE_2);
8787
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,11 +200,11 @@ public Class<?> getProp() {
200200
}
201201
{ // always passes
202202
BeanInfo info = Introspector.getBeanInfo(Bean.class);
203-
assertThat(info.getPropertyDescriptors().length).isEqualTo(2);
203+
assertThat(info.getPropertyDescriptors()).hasSize(2);
204204
}
205205
{ // failed prior to fix for SPR-9453
206206
BeanInfo info = new ExtendedBeanInfo(Introspector.getBeanInfo(Bean.class));
207-
assertThat(info.getPropertyDescriptors().length).isEqualTo(2);
207+
assertThat(info.getPropertyDescriptors()).hasSize(2);
208208
}
209209
}
210210

@@ -585,7 +585,7 @@ class C extends B {
585585
assertThat(hasReadMethodForProperty(ebi, "foo")).isTrue();
586586
assertThat(hasWriteMethodForProperty(ebi, "foo")).isTrue();
587587

588-
assertThat(ebi.getPropertyDescriptors().length).isEqualTo(bi.getPropertyDescriptors().length);
588+
assertThat(ebi.getPropertyDescriptors()).hasSize(bi.getPropertyDescriptors().length);
589589
}
590590

591591
@Test
@@ -711,7 +711,7 @@ void propertyCountsMatch() throws Exception {
711711
BeanInfo bi = Introspector.getBeanInfo(TestBean.class);
712712
BeanInfo ebi = new ExtendedBeanInfo(bi);
713713

714-
assertThat(ebi.getPropertyDescriptors().length).isEqualTo(bi.getPropertyDescriptors().length);
714+
assertThat(ebi.getPropertyDescriptors()).hasSize(bi.getPropertyDescriptors().length);
715715
}
716716

717717
@Test
@@ -731,7 +731,7 @@ class ExtendedTestBean extends TestBean {
731731
}
732732
}
733733
assertThat(found).isTrue();
734-
assertThat(ebi.getPropertyDescriptors().length).isEqualTo(bi.getPropertyDescriptors().length+1);
734+
assertThat(ebi.getPropertyDescriptors()).hasSize(bi.getPropertyDescriptors().length+1);
735735
}
736736

737737
/**

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

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public void testExtendedResourceInjection() {
159159
assertThat(bean.getBeanFactory()).isSameAs(bf);
160160

161161
String[] depBeans = bf.getDependenciesForBean("annotatedBean");
162-
assertThat(depBeans.length).isEqualTo(2);
162+
assertThat(depBeans).hasSize(2);
163163
assertThat(depBeans[0]).isEqualTo("testBean");
164164
assertThat(depBeans[1]).isEqualTo("nestedTestBean");
165165
}
@@ -266,10 +266,10 @@ public void testOptionalResourceInjection() {
266266
assertThat(bean.getTestBean3()).isSameAs(tb);
267267
assertThat(bean.getTestBean4()).isSameAs(tb);
268268
assertThat(bean.getIndexedTestBean()).isSameAs(itb);
269-
assertThat(bean.getNestedTestBeans().length).isEqualTo(2);
269+
assertThat(bean.getNestedTestBeans()).hasSize(2);
270270
assertThat(bean.getNestedTestBeans()[0]).isSameAs(ntb1);
271271
assertThat(bean.getNestedTestBeans()[1]).isSameAs(ntb2);
272-
assertThat(bean.nestedTestBeansField.length).isEqualTo(2);
272+
assertThat(bean.nestedTestBeansField).hasSize(2);
273273
assertThat(bean.nestedTestBeansField[0]).isSameAs(ntb1);
274274
assertThat(bean.nestedTestBeansField[1]).isSameAs(ntb2);
275275
}
@@ -294,10 +294,10 @@ public void testOptionalResourceInjectionWithSingletonRemoval() {
294294
assertThat(bean.getTestBean3()).isSameAs(tb);
295295
assertThat(bean.getTestBean4()).isSameAs(tb);
296296
assertThat(bean.getIndexedTestBean()).isSameAs(itb);
297-
assertThat(bean.getNestedTestBeans().length).isEqualTo(2);
297+
assertThat(bean.getNestedTestBeans()).hasSize(2);
298298
assertThat(bean.getNestedTestBeans()[0]).isSameAs(ntb1);
299299
assertThat(bean.getNestedTestBeans()[1]).isSameAs(ntb2);
300-
assertThat(bean.nestedTestBeansField.length).isEqualTo(2);
300+
assertThat(bean.nestedTestBeansField).hasSize(2);
301301
assertThat(bean.nestedTestBeansField[0]).isSameAs(ntb1);
302302
assertThat(bean.nestedTestBeansField[1]).isSameAs(ntb2);
303303

@@ -309,10 +309,10 @@ public void testOptionalResourceInjectionWithSingletonRemoval() {
309309
assertThat(bean.getTestBean3()).isNull();
310310
assertThat(bean.getTestBean4()).isNull();
311311
assertThat(bean.getIndexedTestBean()).isSameAs(itb);
312-
assertThat(bean.getNestedTestBeans().length).isEqualTo(2);
312+
assertThat(bean.getNestedTestBeans()).hasSize(2);
313313
assertThat(bean.getNestedTestBeans()[0]).isSameAs(ntb1);
314314
assertThat(bean.getNestedTestBeans()[1]).isSameAs(ntb2);
315-
assertThat(bean.nestedTestBeansField.length).isEqualTo(2);
315+
assertThat(bean.nestedTestBeansField).hasSize(2);
316316
assertThat(bean.nestedTestBeansField[0]).isSameAs(ntb1);
317317
assertThat(bean.nestedTestBeansField[1]).isSameAs(ntb2);
318318

@@ -324,10 +324,10 @@ public void testOptionalResourceInjectionWithSingletonRemoval() {
324324
assertThat(bean.getTestBean3()).isSameAs(tb);
325325
assertThat(bean.getTestBean4()).isSameAs(tb);
326326
assertThat(bean.getIndexedTestBean()).isSameAs(itb);
327-
assertThat(bean.getNestedTestBeans().length).isEqualTo(2);
327+
assertThat(bean.getNestedTestBeans()).hasSize(2);
328328
assertThat(bean.getNestedTestBeans()[0]).isSameAs(ntb1);
329329
assertThat(bean.getNestedTestBeans()[1]).isSameAs(ntb2);
330-
assertThat(bean.nestedTestBeansField.length).isEqualTo(2);
330+
assertThat(bean.nestedTestBeansField).hasSize(2);
331331
assertThat(bean.nestedTestBeansField[0]).isSameAs(ntb1);
332332
assertThat(bean.nestedTestBeansField[1]).isSameAs(ntb2);
333333
}
@@ -351,10 +351,10 @@ public void testOptionalResourceInjectionWithBeanDefinitionRemoval() {
351351
assertThat(bean.getTestBean3()).isSameAs(bf.getBean("testBean"));
352352
assertThat(bean.getTestBean4()).isSameAs(bf.getBean("testBean"));
353353
assertThat(bean.getIndexedTestBean()).isSameAs(itb);
354-
assertThat(bean.getNestedTestBeans().length).isEqualTo(2);
354+
assertThat(bean.getNestedTestBeans()).hasSize(2);
355355
assertThat(bean.getNestedTestBeans()[0]).isSameAs(ntb1);
356356
assertThat(bean.getNestedTestBeans()[1]).isSameAs(ntb2);
357-
assertThat(bean.nestedTestBeansField.length).isEqualTo(2);
357+
assertThat(bean.nestedTestBeansField).hasSize(2);
358358
assertThat(bean.nestedTestBeansField[0]).isSameAs(ntb1);
359359
assertThat(bean.nestedTestBeansField[1]).isSameAs(ntb2);
360360

@@ -366,10 +366,10 @@ public void testOptionalResourceInjectionWithBeanDefinitionRemoval() {
366366
assertThat(bean.getTestBean3()).isNull();
367367
assertThat(bean.getTestBean4()).isNull();
368368
assertThat(bean.getIndexedTestBean()).isSameAs(itb);
369-
assertThat(bean.getNestedTestBeans().length).isEqualTo(2);
369+
assertThat(bean.getNestedTestBeans()).hasSize(2);
370370
assertThat(bean.getNestedTestBeans()[0]).isSameAs(ntb1);
371371
assertThat(bean.getNestedTestBeans()[1]).isSameAs(ntb2);
372-
assertThat(bean.nestedTestBeansField.length).isEqualTo(2);
372+
assertThat(bean.nestedTestBeansField).hasSize(2);
373373
assertThat(bean.nestedTestBeansField[0]).isSameAs(ntb1);
374374
assertThat(bean.nestedTestBeansField[1]).isSameAs(ntb2);
375375

@@ -381,10 +381,10 @@ public void testOptionalResourceInjectionWithBeanDefinitionRemoval() {
381381
assertThat(bean.getTestBean3()).isSameAs(bf.getBean("testBean"));
382382
assertThat(bean.getTestBean4()).isSameAs(bf.getBean("testBean"));
383383
assertThat(bean.getIndexedTestBean()).isSameAs(itb);
384-
assertThat(bean.getNestedTestBeans().length).isEqualTo(2);
384+
assertThat(bean.getNestedTestBeans()).hasSize(2);
385385
assertThat(bean.getNestedTestBeans()[0]).isSameAs(ntb1);
386386
assertThat(bean.getNestedTestBeans()[1]).isSameAs(ntb2);
387-
assertThat(bean.nestedTestBeansField.length).isEqualTo(2);
387+
assertThat(bean.nestedTestBeansField).hasSize(2);
388388
assertThat(bean.nestedTestBeansField[0]).isSameAs(ntb1);
389389
assertThat(bean.nestedTestBeansField[1]).isSameAs(ntb2);
390390
}
@@ -496,10 +496,10 @@ public void testOrderedResourceInjection() {
496496
assertThat(bean.getTestBean3()).isSameAs(tb);
497497
assertThat(bean.getTestBean4()).isSameAs(tb);
498498
assertThat(bean.getIndexedTestBean()).isSameAs(itb);
499-
assertThat(bean.getNestedTestBeans().length).isEqualTo(2);
499+
assertThat(bean.getNestedTestBeans()).hasSize(2);
500500
assertThat(bean.getNestedTestBeans()[0]).isSameAs(ntb2);
501501
assertThat(bean.getNestedTestBeans()[1]).isSameAs(ntb1);
502-
assertThat(bean.nestedTestBeansField.length).isEqualTo(2);
502+
assertThat(bean.nestedTestBeansField).hasSize(2);
503503
assertThat(bean.nestedTestBeansField[0]).isSameAs(ntb2);
504504
assertThat(bean.nestedTestBeansField[1]).isSameAs(ntb1);
505505
}
@@ -522,10 +522,10 @@ public void testAnnotationOrderedResourceInjection() {
522522
assertThat(bean.getTestBean3()).isSameAs(tb);
523523
assertThat(bean.getTestBean4()).isSameAs(tb);
524524
assertThat(bean.getIndexedTestBean()).isSameAs(itb);
525-
assertThat(bean.getNestedTestBeans().length).isEqualTo(2);
525+
assertThat(bean.getNestedTestBeans()).hasSize(2);
526526
assertThat(bean.getNestedTestBeans()[0]).isSameAs(ntb2);
527527
assertThat(bean.getNestedTestBeans()[1]).isSameAs(ntb1);
528-
assertThat(bean.nestedTestBeansField.length).isEqualTo(2);
528+
assertThat(bean.nestedTestBeansField).hasSize(2);
529529
assertThat(bean.nestedTestBeansField[0]).isSameAs(ntb2);
530530
assertThat(bean.nestedTestBeansField[1]).isSameAs(ntb1);
531531
}
@@ -772,7 +772,7 @@ public void testConstructorResourceInjectionWithMultipleCandidates() {
772772
ConstructorsResourceInjectionBean bean = (ConstructorsResourceInjectionBean) bf.getBean("annotatedBean");
773773
assertThat(bean.getTestBean3()).isNull();
774774
assertThat(bean.getTestBean4()).isSameAs(tb);
775-
assertThat(bean.getNestedTestBeans().length).isEqualTo(2);
775+
assertThat(bean.getNestedTestBeans()).hasSize(2);
776776
assertThat(bean.getNestedTestBeans()[0]).isSameAs(ntb1);
777777
assertThat(bean.getNestedTestBeans()[1]).isSameAs(ntb2);
778778
}
@@ -838,7 +838,7 @@ public void testConstructorResourceInjectionWithMultipleOrderedCandidates() {
838838
ConstructorsResourceInjectionBean bean = (ConstructorsResourceInjectionBean) bf.getBean("annotatedBean");
839839
assertThat(bean.getTestBean3()).isNull();
840840
assertThat(bean.getTestBean4()).isSameAs(tb);
841-
assertThat(bean.getNestedTestBeans().length).isEqualTo(2);
841+
assertThat(bean.getNestedTestBeans()).hasSize(2);
842842
assertThat(bean.getNestedTestBeans()[0]).isSameAs(ntb2);
843843
assertThat(bean.getNestedTestBeans()[1]).isSameAs(ntb1);
844844
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ private void doTestPropertyPlaceholderConfigurer(boolean parentChildSeparation)
401401
assertThat(tb1.getSpouse()).isEqualTo(tb2);
402402
assertThat(tb1.getSomeMap()).hasSize(1);
403403
assertThat(tb1.getSomeMap().get("myKey")).isEqualTo("myValue");
404-
assertThat(tb2.getStringArray().length).isEqualTo(2);
404+
assertThat(tb2.getStringArray()).hasSize(2);
405405
assertThat(tb2.getStringArray()[0]).isEqualTo(System.getProperty("os.name"));
406406
assertThat(tb2.getStringArray()[1]).isEqualTo("98");
407407
assertThat(tb2.getFriends()).hasSize(2);
@@ -577,7 +577,7 @@ public void testPropertyPlaceholderConfigurerWithSelfReferencingPlaceholderInAli
577577

578578
TestBean tb = (TestBean) factory.getBean("tb");
579579
assertThat(tb).isNotNull();
580-
assertThat(factory.getAliases("tb").length).isEqualTo(0);
580+
assertThat(factory.getAliases("tb")).hasSize(0);
581581
}
582582

583583
@Test

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public Object get(String name, ObjectFactory<?> objectFactory) {
6363
beanFactory.registerScope("myScope", scope);
6464

6565
String[] scopeNames = beanFactory.getRegisteredScopeNames();
66-
assertThat(scopeNames.length).isEqualTo(1);
66+
assertThat(scopeNames).hasSize(1);
6767
assertThat(scopeNames[0]).isEqualTo("myScope");
6868
assertThat(beanFactory.getRegisteredScope("myScope")).isSameAs(scope);
6969

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ public void testSingletons() {
4545
assertThat(beanRegistry.getSingleton("tb2")).isSameAs(tb2);
4646
assertThat(beanRegistry.getSingletonCount()).isEqualTo(2);
4747
String[] names = beanRegistry.getSingletonNames();
48-
assertThat(names.length).isEqualTo(2);
48+
assertThat(names).hasSize(2);
4949
assertThat(names[0]).isEqualTo("tb");
5050
assertThat(names[1]).isEqualTo("tb2");
5151

5252
beanRegistry.destroySingletons();
5353
assertThat(beanRegistry.getSingletonCount()).isEqualTo(0);
54-
assertThat(beanRegistry.getSingletonNames().length).isEqualTo(0);
54+
assertThat(beanRegistry.getSingletonNames()).hasSize(0);
5555
}
5656

5757
@Test
@@ -66,13 +66,13 @@ public void testDisposableBean() {
6666
assertThat(beanRegistry.getSingleton("tb")).isSameAs(tb);
6767
assertThat(beanRegistry.getSingletonCount()).isEqualTo(1);
6868
String[] names = beanRegistry.getSingletonNames();
69-
assertThat(names.length).isEqualTo(1);
69+
assertThat(names).hasSize(1);
7070
assertThat(names[0]).isEqualTo("tb");
7171
assertThat(tb.wasDestroyed()).isFalse();
7272

7373
beanRegistry.destroySingletons();
7474
assertThat(beanRegistry.getSingletonCount()).isEqualTo(0);
75-
assertThat(beanRegistry.getSingletonNames().length).isEqualTo(0);
75+
assertThat(beanRegistry.getSingletonNames()).hasSize(0);
7676
assertThat(tb.wasDestroyed()).isTrue();
7777
}
7878

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,23 +75,23 @@ void defaultsEventReceived() throws Exception {
7575
void beanEventReceived() throws Exception {
7676
ComponentDefinition componentDefinition1 = this.eventListener.getComponentDefinition("testBean");
7777
assertThat(componentDefinition1).isInstanceOf(BeanComponentDefinition.class);
78-
assertThat(componentDefinition1.getBeanDefinitions().length).isEqualTo(1);
78+
assertThat(componentDefinition1.getBeanDefinitions()).hasSize(1);
7979
BeanDefinition beanDefinition1 = componentDefinition1.getBeanDefinitions()[0];
8080
assertThat(beanDefinition1.getConstructorArgumentValues().getGenericArgumentValue(String.class).getValue()).isEqualTo(new TypedStringValue("Rob Harrop"));
81-
assertThat(componentDefinition1.getBeanReferences().length).isEqualTo(1);
81+
assertThat(componentDefinition1.getBeanReferences()).hasSize(1);
8282
assertThat(componentDefinition1.getBeanReferences()[0].getBeanName()).isEqualTo("testBean2");
83-
assertThat(componentDefinition1.getInnerBeanDefinitions().length).isEqualTo(1);
83+
assertThat(componentDefinition1.getInnerBeanDefinitions()).hasSize(1);
8484
BeanDefinition innerBd1 = componentDefinition1.getInnerBeanDefinitions()[0];
8585
assertThat(innerBd1.getConstructorArgumentValues().getGenericArgumentValue(String.class).getValue()).isEqualTo(new TypedStringValue("ACME"));
8686
assertThat(componentDefinition1.getSource()).isInstanceOf(Element.class);
8787

8888
ComponentDefinition componentDefinition2 = this.eventListener.getComponentDefinition("testBean2");
8989
assertThat(componentDefinition2).isInstanceOf(BeanComponentDefinition.class);
90-
assertThat(componentDefinition1.getBeanDefinitions().length).isEqualTo(1);
90+
assertThat(componentDefinition1.getBeanDefinitions()).hasSize(1);
9191
BeanDefinition beanDefinition2 = componentDefinition2.getBeanDefinitions()[0];
9292
assertThat(beanDefinition2.getPropertyValues().getPropertyValue("name").getValue()).isEqualTo(new TypedStringValue("Juergen Hoeller"));
93-
assertThat(componentDefinition2.getBeanReferences().length).isEqualTo(0);
94-
assertThat(componentDefinition2.getInnerBeanDefinitions().length).isEqualTo(1);
93+
assertThat(componentDefinition2.getBeanReferences()).hasSize(0);
94+
assertThat(componentDefinition2.getInnerBeanDefinitions()).hasSize(1);
9595
BeanDefinition innerBd2 = componentDefinition2.getInnerBeanDefinitions()[0];
9696
assertThat(innerBd2.getPropertyValues().getPropertyValue("name").getValue()).isEqualTo(new TypedStringValue("Eva Schallmeiner"));
9797
assertThat(componentDefinition2.getSource()).isInstanceOf(Element.class);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ void testNestedCollections() {
203203
void testNestedShortcutCollections() {
204204
TestBean bean = (TestBean) this.beanFactory.getBean("nestedShortcutCollections");
205205

206-
assertThat(bean.getStringArray().length).isEqualTo(1);
206+
assertThat(bean.getStringArray()).hasSize(1);
207207
assertThat(bean.getStringArray()[0]).isEqualTo("fooStr");
208208

209209
List<?> list = bean.getSomeList();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public void withFreshInputStream() {
109109

110110
private void testBeanDefinitions(BeanDefinitionRegistry registry) {
111111
assertThat(registry.getBeanDefinitionCount()).isEqualTo(24);
112-
assertThat(registry.getBeanDefinitionNames().length).isEqualTo(24);
112+
assertThat(registry.getBeanDefinitionNames()).hasSize(24);
113113
assertThat(Arrays.asList(registry.getBeanDefinitionNames()).contains("rod")).isTrue();
114114
assertThat(Arrays.asList(registry.getBeanDefinitionNames()).contains("aliased")).isTrue();
115115
assertThat(registry.containsBeanDefinition("rod")).isTrue();
@@ -118,7 +118,7 @@ private void testBeanDefinitions(BeanDefinitionRegistry registry) {
118118
assertThat(registry.getBeanDefinition("aliased").getBeanClassName()).isEqualTo(TestBean.class.getName());
119119
assertThat(registry.isAlias("youralias")).isTrue();
120120
String[] aliases = registry.getAliases("aliased");
121-
assertThat(aliases.length).isEqualTo(2);
121+
assertThat(aliases).hasSize(2);
122122
assertThat(ObjectUtils.containsElement(aliases, "myalias")).isTrue();
123123
assertThat(ObjectUtils.containsElement(aliases, "youralias")).isTrue();
124124
}

0 commit comments

Comments
 (0)