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

User AssertJ's hasSize() for arrays

Browse Source 
Achieved via global search-and-replace.
This commit is contained in:
Sam Brannen
2022-11-22 17:03:45 +01:00
parent 36f7597f25
commit d5b0b2b1a1
72 changed files with 277 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java
View File

@@ -51,7 +51,7 @@ public class AtAspectJAnnotationBindingTests {
public void testAnnotationBindingInAroundAdvice() {
assertThat(testBean.doThis()).isEqualTo("this value doThis");
assertThat(testBean.doThat()).isEqualTo("that value doThat");
assertThat(testBean.doArray().length).isEqualTo(2);
assertThat(testBean.doArray()).hasSize(2);
}
@Test

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

@@ -214,7 +214,7 @@ public abstract class AbstractAopProxyTests {
Advised a1 = (Advised) p;
Advised a2 = (Advised) p2;
// Check we can manipulate state of p2
assertThat(a2.getAdvisors().length).isEqualTo(a1.getAdvisors().length);
assertThat(a2.getAdvisors()).hasSize(a1.getAdvisors().length);
// This should work as SerializablePerson is equal
assertThat(p2).as("Proxies should be equal, even after one was serialized").isEqualTo(p);
@@ -748,7 +748,7 @@ public abstract class AbstractAopProxyTests {
.withMessageContaining("frozen");
// Check it still works: proxy factory state shouldn't have been corrupted
assertThat(proxied.getAge()).isEqualTo(target.getAge());
assertThat(((Advised) proxied).getAdvisors().length).isEqualTo(1);
assertThat(((Advised) proxied).getAdvisors()).hasSize(1);
}
/**
@@ -771,7 +771,7 @@ public abstract class AbstractAopProxyTests {
.withMessageContaining("frozen");
// Check it still works: proxy factory state shouldn't have been corrupted
assertThat(proxied.getAge()).isEqualTo(target.getAge());
assertThat(advised.getAdvisors().length).isEqualTo(1);
assertThat(advised.getAdvisors()).hasSize(1);
}
@Test
@@ -790,13 +790,13 @@ public abstract class AbstractAopProxyTests {
.isThrownBy(() -> advised.removeAdvisor(0))
.withMessageContaining("frozen");
// Didn't get removed
assertThat(advised.getAdvisors().length).isEqualTo(1);
assertThat(advised.getAdvisors()).hasSize(1);
pc.setFrozen(false);
// Can now remove it
advised.removeAdvisor(0);
// Check it still works: proxy factory state shouldn't have been corrupted
assertThat(proxied.getAge()).isEqualTo(target.getAge());
assertThat(advised.getAdvisors().length).isEqualTo(0);
assertThat(advised.getAdvisors()).hasSize(0);
}
@Test
@@ -1173,7 +1173,7 @@ public abstract class AbstractAopProxyTests {
IOther proxyA = (IOther) createProxy(pfa);
IOther proxyB = (IOther) createProxy(pfb);
assertThat(pfb.getAdvisors().length).isEqualTo(pfa.getAdvisors().length);
assertThat(pfb.getAdvisors()).hasSize(pfa.getAdvisors().length);
assertThat(b).isEqualTo(a);
assertThat(i2).isEqualTo(i1);
assertThat(proxyB).isEqualTo(proxyA);

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

@@ -190,7 +190,7 @@ class XmlBeanFactoryTests {
assertThat(hasInnerBeans.getFriends()).isNotNull();
Object[] friends = hasInnerBeans.getFriends().toArray();
assertThat(friends.length).isEqualTo(3);
assertThat(friends).hasSize(3);
DerivedTestBean inner2 = (DerivedTestBean) friends[0];
assertThat(inner2.getName()).isEqualTo("inner2");
assertThat(inner2.getBeanName().startsWith(DerivedTestBean.class.getName())).isTrue();
@@ -261,7 +261,7 @@ class XmlBeanFactoryTests {
assertThat(hasInnerBeans.getFriends()).isNotNull();
Object[] friends = hasInnerBeans.getFriends().toArray();
assertThat(friends.length).isEqualTo(3);
assertThat(friends).hasSize(3);
DerivedTestBean inner2 = (DerivedTestBean) friends[0];
assertThat(inner2.getName()).isEqualTo("inner2");
assertThat(inner2.getBeanName().startsWith(DerivedTestBean.class.getName())).isTrue();
@@ -1510,7 +1510,7 @@ class XmlBeanFactoryTests {
new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT);
ConstructorArrayTestBean bean = (ConstructorArrayTestBean) xbf.getBean("constructorArray");
assertThat(bean.array instanceof int[]).isTrue();
assertThat(((int[]) bean.array).length).isEqualTo(1);
assertThat(((int[]) bean.array)).hasSize(1);
assertThat(((int[]) bean.array)[0]).isEqualTo(1);
}
@@ -1520,7 +1520,7 @@ class XmlBeanFactoryTests {
new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT);
ConstructorArrayTestBean bean = (ConstructorArrayTestBean) xbf.getBean("indexedConstructorArray");
assertThat(bean.array instanceof int[]).isTrue();
assertThat(((int[]) bean.array).length).isEqualTo(1);
assertThat(((int[]) bean.array)).hasSize(1);
assertThat(((int[]) bean.array)[0]).isEqualTo(1);
}
@@ -1530,7 +1530,7 @@ class XmlBeanFactoryTests {
new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT);
ConstructorArrayTestBean bean = (ConstructorArrayTestBean) xbf.getBean("constructorArrayNoType");
assertThat(bean.array instanceof String[]).isTrue();
assertThat(((String[]) bean.array).length).isEqualTo(0);
assertThat(((String[]) bean.array)).hasSize(0);
}
@Test
@@ -1541,7 +1541,7 @@ class XmlBeanFactoryTests {
bd.setLenientConstructorResolution(false);
ConstructorArrayTestBean bean = (ConstructorArrayTestBean) xbf.getBean("constructorArrayNoType");
assertThat(bean.array instanceof String[]).isTrue();
assertThat(((String[]) bean.array).length).isEqualTo(0);
assertThat(((String[]) bean.array)).hasSize(0);
}
@Test
@@ -1596,7 +1596,7 @@ class XmlBeanFactoryTests {
@Override
public Object reimplement(Object obj, Method method, Object[] args) throws Throwable {
assertThat(args.length).isEqualTo(1);
assertThat(args).hasSize(1);
assertThat(method.getName()).isEqualTo("doSomething");
lastArg = args[0];
return null;

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

@@ -473,7 +473,7 @@ public class ClassPathBeanDefinitionScannerTests {
assertThat(fooService.eventPublisher).isSameAs(context);
assertThat(fooService.messageSource).isSameAs(ms);
assertThat(fooService.context).isSameAs(context);
assertThat(fooService.configurableContext.length).isEqualTo(1);
assertThat(fooService.configurableContext).hasSize(1);
assertThat(fooService.configurableContext[0]).isSameAs(context);
assertThat(fooService.genericContext).isSameAs(context);
}

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

@@ -232,7 +232,7 @@ public class CommonAnnotationBeanPostProcessorTests {
assertThat(tb).isNotSameAs(anotherBean.getTestBean6());
String[] depBeans = bf.getDependenciesForBean("annotatedBean");
assertThat(depBeans.length).isEqualTo(1);
assertThat(depBeans).hasSize(1);
assertThat(depBeans[0]).isEqualTo("testBean4");
}

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

@@ -647,11 +647,11 @@ class ConfigurationClassPostProcessorTests {
assertThat(beanNames).contains("stringRepo");
beanNames = beanFactory.getBeanNamesForType(ResolvableType.forClassWithGenerics(Repository.class, String.class));
assertThat(beanNames.length).isEqualTo(1);
assertThat(beanNames).hasSize(1);
assertThat(beanNames[0]).isEqualTo("stringRepo");
beanNames = beanFactory.getBeanNamesForType(ResolvableType.forClassWithGenerics(Repository.class, String.class));
assertThat(beanNames.length).isEqualTo(1);
assertThat(beanNames).hasSize(1);
assertThat(beanNames[0]).isEqualTo("stringRepo");
}
@@ -665,11 +665,11 @@ class ConfigurationClassPostProcessorTests {
assertThat(beanNames).contains("stringRepo");
beanNames = beanFactory.getBeanNamesForType(ResolvableType.forClassWithGenerics(Repository.class, String.class));
assertThat(beanNames.length).isEqualTo(1);
assertThat(beanNames).hasSize(1);
assertThat(beanNames[0]).isEqualTo("stringRepo");
beanNames = beanFactory.getBeanNamesForType(ResolvableType.forClassWithGenerics(Repository.class, String.class));
assertThat(beanNames.length).isEqualTo(1);
assertThat(beanNames).hasSize(1);
assertThat(beanNames[0]).isEqualTo("stringRepo");
}
@@ -682,10 +682,10 @@ class ConfigurationClassPostProcessorTests {
assertThat(beanNames).contains("stringRepo");
beanNames = beanFactory.getBeanNamesForType(ResolvableType.forClassWithGenerics(Repository.class, String.class));
assertThat(beanNames.length).isEqualTo(0);
assertThat(beanNames).hasSize(0);
beanNames = beanFactory.getBeanNamesForType(ResolvableType.forClassWithGenerics(Repository.class, String.class));
assertThat(beanNames.length).isEqualTo(0);
assertThat(beanNames).hasSize(0);
}
@Test
@@ -698,11 +698,11 @@ class ConfigurationClassPostProcessorTests {
assertThat(beanNames).contains("stringRepo");
beanNames = beanFactory.getBeanNamesForType(ResolvableType.forClassWithGenerics(Repository.class, String.class));
assertThat(beanNames.length).isEqualTo(1);
assertThat(beanNames).hasSize(1);
assertThat(beanNames[0]).isEqualTo("stringRepo");
beanNames = beanFactory.getBeanNamesForType(ResolvableType.forClassWithGenerics(Repository.class, String.class));
assertThat(beanNames.length).isEqualTo(1);
assertThat(beanNames).hasSize(1);
assertThat(beanNames[0]).isEqualTo("stringRepo");
}
@@ -715,11 +715,11 @@ class ConfigurationClassPostProcessorTests {
assertThat(beanNames).contains("stringRepo");
beanNames = beanFactory.getBeanNamesForType(ResolvableType.forClassWithGenerics(Repository.class, String.class));
assertThat(beanNames.length).isEqualTo(1);
assertThat(beanNames).hasSize(1);
assertThat(beanNames[0]).isEqualTo("stringRepo");
beanNames = beanFactory.getBeanNamesForType(ResolvableType.forClassWithGenerics(Repository.class, String.class));
assertThat(beanNames.length).isEqualTo(1);
assertThat(beanNames).hasSize(1);
assertThat(beanNames[0]).isEqualTo("stringRepo");
}
@@ -733,11 +733,11 @@ class ConfigurationClassPostProcessorTests {
assertThat(beanNames).contains("stringRepo");
beanNames = beanFactory.getBeanNamesForType(ResolvableType.forClassWithGenerics(Repository.class, String.class));
assertThat(beanNames.length).isEqualTo(1);
assertThat(beanNames).hasSize(1);
assertThat(beanNames[0]).isEqualTo("stringRepo");
beanNames = beanFactory.getBeanNamesForType(ResolvableType.forClassWithGenerics(Repository.class, String.class));
assertThat(beanNames.length).isEqualTo(1);
assertThat(beanNames).hasSize(1);
assertThat(beanNames[0]).isEqualTo("stringRepo");
}
@@ -755,11 +755,11 @@ class ConfigurationClassPostProcessorTests {
assertThat(beanNames).contains("stringRepo");
beanNames = beanFactory.getBeanNamesForType(ResolvableType.forClassWithGenerics(Repository.class, String.class));
assertThat(beanNames.length).isEqualTo(1);
assertThat(beanNames).hasSize(1);
assertThat(beanNames[0]).isEqualTo("stringRepo");
beanNames = beanFactory.getBeanNamesForType(ResolvableType.forClassWithGenerics(Repository.class, String.class));
assertThat(beanNames.length).isEqualTo(1);
assertThat(beanNames).hasSize(1);
assertThat(beanNames[0]).isEqualTo("stringRepo");
assertThat(AopUtils.isCglibProxy(beanFactory.getBean("stringRepo"))).isTrue();
@@ -780,11 +780,11 @@ class ConfigurationClassPostProcessorTests {
assertThat(beanNames).contains("stringRepo");
beanNames = beanFactory.getBeanNamesForType(ResolvableType.forClassWithGenerics(Repository.class, String.class));
assertThat(beanNames.length).isEqualTo(1);
assertThat(beanNames).hasSize(1);
assertThat(beanNames[0]).isEqualTo("stringRepo");
beanNames = beanFactory.getBeanNamesForType(ResolvableType.forClassWithGenerics(Repository.class, String.class));
assertThat(beanNames.length).isEqualTo(1);
assertThat(beanNames).hasSize(1);
assertThat(beanNames[0]).isEqualTo("stringRepo");
assertThat(AopUtils.isCglibProxy(beanFactory.getBean("stringRepo"))).isTrue();
@@ -805,11 +805,11 @@ class ConfigurationClassPostProcessorTests {
assertThat(beanNames).contains("stringRepo");
beanNames = beanFactory.getBeanNamesForType(ResolvableType.forClassWithGenerics(Repository.class, String.class));
assertThat(beanNames.length).isEqualTo(1);
assertThat(beanNames).hasSize(1);
assertThat(beanNames[0]).isEqualTo("stringRepo");
beanNames = beanFactory.getBeanNamesForType(ResolvableType.forClassWithGenerics(Repository.class, String.class));
assertThat(beanNames.length).isEqualTo(1);
assertThat(beanNames).hasSize(1);
assertThat(beanNames[0]).isEqualTo("stringRepo");
assertThat(AopUtils.isCglibProxy(beanFactory.getBean("stringRepo"))).isTrue();
@@ -830,11 +830,11 @@ class ConfigurationClassPostProcessorTests {
assertThat(beanNames).contains("stringRepo");
beanNames = beanFactory.getBeanNamesForType(ResolvableType.forClassWithGenerics(Repository.class, String.class));
assertThat(beanNames.length).isEqualTo(1);
assertThat(beanNames).hasSize(1);
assertThat(beanNames[0]).isEqualTo("stringRepo");
beanNames = beanFactory.getBeanNamesForType(ResolvableType.forClassWithGenerics(Repository.class, String.class));
assertThat(beanNames.length).isEqualTo(1);
assertThat(beanNames).hasSize(1);
assertThat(beanNames[0]).isEqualTo("stringRepo");
assertThat(AopUtils.isCglibProxy(beanFactory.getBean("stringRepo"))).isTrue();
@@ -853,11 +853,11 @@ class ConfigurationClassPostProcessorTests {
assertThat(beanNames).contains("stringRepo");
beanNames = beanFactory.getBeanNamesForType(ResolvableType.forClassWithGenerics(RepositoryInterface.class, String.class));
assertThat(beanNames.length).isEqualTo(1);
assertThat(beanNames).hasSize(1);
assertThat(beanNames[0]).isEqualTo("stringRepo");
beanNames = beanFactory.getBeanNamesForType(ResolvableType.forClassWithGenerics(RepositoryInterface.class, String.class));
assertThat(beanNames.length).isEqualTo(1);
assertThat(beanNames).hasSize(1);
assertThat(beanNames[0]).isEqualTo("stringRepo");
assertThat(AopUtils.isJdkDynamicProxy(beanFactory.getBean("stringRepo"))).isTrue();
@@ -877,11 +877,11 @@ class ConfigurationClassPostProcessorTests {
assertThat(beanNames).contains("stringRepo");
beanNames = beanFactory.getBeanNamesForType(ResolvableType.forClassWithGenerics(RepositoryInterface.class, String.class));
assertThat(beanNames.length).isEqualTo(1);
assertThat(beanNames).hasSize(1);
assertThat(beanNames[0]).isEqualTo("stringRepo");
beanNames = beanFactory.getBeanNamesForType(ResolvableType.forClassWithGenerics(RepositoryInterface.class, String.class));
assertThat(beanNames.length).isEqualTo(1);
assertThat(beanNames).hasSize(1);
assertThat(beanNames[0]).isEqualTo("stringRepo");
assertThat(AopUtils.isJdkDynamicProxy(beanFactory.getBean("stringRepo"))).isTrue();
@@ -901,11 +901,11 @@ class ConfigurationClassPostProcessorTests {
assertThat(beanNames).contains("stringRepo");
beanNames = beanFactory.getBeanNamesForType(ResolvableType.forClassWithGenerics(RepositoryInterface.class, String.class));
assertThat(beanNames.length).isEqualTo(1);
assertThat(beanNames).hasSize(1);
assertThat(beanNames[0]).isEqualTo("stringRepo");
beanNames = beanFactory.getBeanNamesForType(ResolvableType.forClassWithGenerics(RepositoryInterface.class, String.class));
assertThat(beanNames.length).isEqualTo(1);
assertThat(beanNames).hasSize(1);
assertThat(beanNames[0]).isEqualTo("stringRepo");
assertThat(AopUtils.isJdkDynamicProxy(beanFactory.getBean("stringRepo"))).isTrue();
@@ -925,11 +925,11 @@ class ConfigurationClassPostProcessorTests {
assertThat(beanNames).contains("stringRepo");
beanNames = beanFactory.getBeanNamesForType(ResolvableType.forClassWithGenerics(RepositoryInterface.class, String.class));
assertThat(beanNames.length).isEqualTo(1);
assertThat(beanNames).hasSize(1);
assertThat(beanNames[0]).isEqualTo("stringRepo");
beanNames = beanFactory.getBeanNamesForType(ResolvableType.forClassWithGenerics(RepositoryInterface.class, String.class));
assertThat(beanNames.length).isEqualTo(1);
assertThat(beanNames).hasSize(1);
assertThat(beanNames[0]).isEqualTo("stringRepo");
assertThat(AopUtils.isJdkDynamicProxy(beanFactory.getBean("stringRepo"))).isTrue();
@@ -1030,7 +1030,7 @@ class ConfigurationClassPostProcessorTests {
ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext(VarargConfiguration.class, TestBean.class);
VarargConfiguration bean = ctx.getBean(VarargConfiguration.class);
assertThat(bean.testBeans).isNotNull();
assertThat(bean.testBeans.length).isEqualTo(1);
assertThat(bean.testBeans).hasSize(1);
assertThat(bean.testBeans[0]).isSameAs(ctx.getBean(TestBean.class));
ctx.close();
}
@@ -1040,7 +1040,7 @@ class ConfigurationClassPostProcessorTests {
ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext(VarargConfiguration.class);
VarargConfiguration bean = ctx.getBean(VarargConfiguration.class);
assertThat(bean.testBeans).isNotNull();
assertThat(bean.testBeans.length).isEqualTo(0);
assertThat(bean.testBeans).hasSize(0);
ctx.close();
}

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

@@ -172,15 +172,15 @@ class ConfigurationClassProcessingTests {
assertThat(condition).isTrue();
String[] beanNames = factory.getBeanNamesForType(FactoryBean.class);
assertThat(beanNames.length).isEqualTo(1);
assertThat(beanNames).hasSize(1);
assertThat(beanNames[0]).isEqualTo("&factoryBean");
beanNames = factory.getBeanNamesForType(BeanClassLoaderAware.class);
assertThat(beanNames.length).isEqualTo(1);
assertThat(beanNames).hasSize(1);
assertThat(beanNames[0]).isEqualTo("&factoryBean");
beanNames = factory.getBeanNamesForType(ListFactoryBean.class);
assertThat(beanNames.length).isEqualTo(1);
assertThat(beanNames).hasSize(1);
assertThat(beanNames[0]).isEqualTo("&factoryBean");
beanNames = factory.getBeanNamesForType(List.class);

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

@@ -261,11 +261,11 @@ public class ClassPathXmlApplicationContextTests {
assertThat(myMs).isSameAs(someMs);
String[] aliases = child.getAliases("someMessageSource");
assertThat(aliases.length).isEqualTo(2);
assertThat(aliases).hasSize(2);
assertThat(aliases[0]).isEqualTo("myMessageSource");
assertThat(aliases[1]).isEqualTo("yourMessageSource");
aliases = child.getAliases("myMessageSource");
assertThat(aliases.length).isEqualTo(2);
assertThat(aliases).hasSize(2);
assertThat(aliases[0]).isEqualTo("someMessageSource");
assertThat(aliases[1]).isEqualTo("yourMessageSource");
@@ -299,16 +299,16 @@ public class ClassPathXmlApplicationContextTests {
private void assertOneMessageSourceOnly(ClassPathXmlApplicationContext ctx, Object myMessageSource) {
String[] beanNamesForType = ctx.getBeanNamesForType(StaticMessageSource.class);
assertThat(beanNamesForType.length).isEqualTo(1);
assertThat(beanNamesForType).hasSize(1);
assertThat(beanNamesForType[0]).isEqualTo("myMessageSource");
beanNamesForType = ctx.getBeanNamesForType(StaticMessageSource.class, true, true);
assertThat(beanNamesForType.length).isEqualTo(1);
assertThat(beanNamesForType).hasSize(1);
assertThat(beanNamesForType[0]).isEqualTo("myMessageSource");
beanNamesForType = BeanFactoryUtils.beanNamesForTypeIncludingAncestors(ctx, StaticMessageSource.class);
assertThat(beanNamesForType.length).isEqualTo(1);
assertThat(beanNamesForType).hasSize(1);
assertThat(beanNamesForType[0]).isEqualTo("myMessageSource");
beanNamesForType = BeanFactoryUtils.beanNamesForTypeIncludingAncestors(ctx, StaticMessageSource.class, true, true);
assertThat(beanNamesForType.length).isEqualTo(1);
assertThat(beanNamesForType).hasSize(1);
assertThat(beanNamesForType[0]).isEqualTo("myMessageSource");
Map<?, StaticMessageSource> beansOfType = ctx.getBeansOfType(StaticMessageSource.class);

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

@@ -108,7 +108,7 @@ public class ModelMapTests {
assertThat(model).hasSize(1);
String[] strings = (String[]) model.get("stringList");
assertThat(strings).isNotNull();
assertThat(strings.length).isEqualTo(2);
assertThat(strings).hasSize(2);
assertThat(strings[0]).isEqualTo("foo");
assertThat(strings[1]).isEqualTo("boing");
}
@@ -134,7 +134,7 @@ public class ModelMapTests {
assertThat(model).hasSize(1);
int[] ints = (int[]) model.get("intList");
assertThat(ints).isNotNull();
assertThat(ints.length).isEqualTo(0);
assertThat(ints).hasSize(0);
}
@Test

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

@@ -1724,7 +1724,7 @@ class DataBinderTests {
pvs.add("stringArray", new String[] {"a1", "b2"});
binder.bind(pvs);
assertThat(binder.getBindingResult().hasErrors()).isFalse();
assertThat(tb.getStringArray().length).isEqualTo(2);
assertThat(tb.getStringArray()).hasSize(2);
assertThat(tb.getStringArray()[0]).isEqualTo("Xa1");
assertThat(tb.getStringArray()[1]).isEqualTo("Xb2");
}