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

8
spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java
View File

@@ -775,11 +775,11 @@ public class MvcNamespaceTests {
CallableProcessingInterceptor[] callableInterceptors =
(CallableProcessingInterceptor[]) fieldAccessor.getPropertyValue("callableInterceptors");
assertThat(callableInterceptors.length).isEqualTo(1);
assertThat(callableInterceptors).hasSize(1);
DeferredResultProcessingInterceptor[] deferredResultInterceptors =
(DeferredResultProcessingInterceptor[]) fieldAccessor.getPropertyValue("deferredResultInterceptors");
assertThat(deferredResultInterceptors.length).isEqualTo(1);
assertThat(deferredResultInterceptors).hasSize(1);
}
@Test
@@ -907,7 +907,7 @@ public class MvcNamespaceTests {
loadBeanDefinitions("mvc-config-cors-minimal.xml");
String[] beanNames = appContext.getBeanNamesForType(AbstractHandlerMapping.class);
assertThat(beanNames.length).isEqualTo(2);
assertThat(beanNames).hasSize(2);
for (String beanName : beanNames) {
AbstractHandlerMapping handlerMapping = (AbstractHandlerMapping)appContext.getBean(beanName);
assertThat(handlerMapping).isNotNull();
@@ -932,7 +932,7 @@ public class MvcNamespaceTests {
loadBeanDefinitions("mvc-config-cors.xml");
String[] beanNames = appContext.getBeanNamesForType(AbstractHandlerMapping.class);
assertThat(beanNames.length).isEqualTo(2);
assertThat(beanNames).hasSize(2);
for (String beanName : beanNames) {
AbstractHandlerMapping handlerMapping = (AbstractHandlerMapping)appContext.getBean(beanName);
assertThat(handlerMapping).isNotNull();

6
spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java
View File

@@ -137,7 +137,7 @@ public class WebMvcConfigurationSupportExtensionTests {
assertThat(chain).isNotNull();
HandlerInterceptor[] interceptors = chain.getInterceptors();
assertThat(interceptors).isNotNull();
assertThat(interceptors.length).isEqualTo(4);
assertThat(interceptors).hasSize(4);
assertThat(interceptors[0].getClass().getSimpleName()).isEqualTo("CorsInterceptor");
assertThat(interceptors[1].getClass()).isEqualTo(LocaleChangeInterceptor.class);
assertThat(interceptors[2].getClass()).isEqualTo(ConversionServiceExposingInterceptor.class);
@@ -235,11 +235,11 @@ public class WebMvcConfigurationSupportExtensionTests {
CallableProcessingInterceptor[] callableInterceptors =
(CallableProcessingInterceptor[]) fieldAccessor.getPropertyValue("callableInterceptors");
assertThat(callableInterceptors.length).isEqualTo(1);
assertThat(callableInterceptors).hasSize(1);
DeferredResultProcessingInterceptor[] deferredResultInterceptors =
(DeferredResultProcessingInterceptor[]) fieldAccessor.getPropertyValue("deferredResultInterceptors");
assertThat(deferredResultInterceptors.length).isEqualTo(1);
assertThat(deferredResultInterceptors).hasSize(1);
assertThat(fieldAccessor.getPropertyValue("ignoreDefaultModelOnRedirect")).asInstanceOf(BOOLEAN).isTrue();
}

2
spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java
View File

@@ -163,7 +163,7 @@ public class WebMvcConfigurationSupportTests {
assertThat(chain).isNotNull();
HandlerInterceptor[] interceptors = chain.getInterceptors();
assertThat(interceptors).isNotNull();
assertThat(interceptors.length).isEqualTo(3);
assertThat(interceptors).hasSize(3);
assertThat(interceptors[1].getClass()).isEqualTo(ConversionServiceExposingInterceptor.class);
assertThat(interceptors[2].getClass()).isEqualTo(ResourceUrlProviderExposingInterceptor.class);
}

2
spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultRenderingResponseTests.java
View File

@@ -140,7 +140,7 @@ public class DefaultRenderingResponseTests {
MockHttpServletResponse response = new MockHttpServletResponse();
ModelAndView mav = result.writeTo(request, response, EMPTY_CONTEXT);
assertThat(mav).isNotNull();
assertThat(response.getCookies().length).isEqualTo(1);
assertThat(response.getCookies()).hasSize(1);
assertThat(response.getCookies()[0].getName()).isEqualTo("name");
assertThat(response.getCookies()[0].getValue()).isEqualTo("value");
}

4
spring-webmvc/src/test/java/org/springframework/web/servlet/function/ResourceHandlerFunctionTests.java
View File

@@ -162,7 +162,7 @@ public class ResourceHandlerFunctionTests {
assertThat(servletResponse.getStatus()).isEqualTo(200);
byte[] actualBytes = servletResponse.getContentAsByteArray();
assertThat(actualBytes.length).isEqualTo(0);
assertThat(actualBytes).hasSize(0);
assertThat(servletResponse.getContentType()).isEqualTo(MediaType.TEXT_PLAIN_VALUE);
assertThat(servletResponse.getContentLength()).isEqualTo(this.resource.contentLength());
}
@@ -185,7 +185,7 @@ public class ResourceHandlerFunctionTests {
String[] methods = StringUtils.tokenizeToStringArray(allowHeader, ",");
assertThat(methods).containsExactlyInAnyOrder("GET","HEAD","OPTIONS");
byte[] actualBytes = servletResponse.getContentAsByteArray();
assertThat(actualBytes.length).isEqualTo(0);
assertThat(actualBytes).hasSize(0);
}
}

2
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorMockTests.java
View File

@@ -832,7 +832,7 @@ public class HttpEntityMethodProcessorMockTests {
assertResponseBody(body);
}
else {
assertThat(servletResponse.getContentAsByteArray().length).isEqualTo(0);
assertThat(servletResponse.getContentAsByteArray()).hasSize(0);
}
if (etag != null) {
assertThat(servletResponse.getHeaderValues(HttpHeaders.ETAG)).hasSize(1);

4
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java
View File

@@ -203,7 +203,7 @@ public class RequestPartMethodArgumentResolverTests {
assertThat(actual).isNotNull();
assertThat(actual instanceof MultipartFile[]).isTrue();
MultipartFile[] parts = (MultipartFile[]) actual;
assertThat(parts.length).isEqualTo(2);
assertThat(parts).hasSize(2);
assertThat(multipartFile1).isEqualTo(parts[0]);
assertThat(multipartFile2).isEqualTo(parts[1]);
}
@@ -269,7 +269,7 @@ public class RequestPartMethodArgumentResolverTests {
Object result = resolver.resolveArgument(paramPartArray, null, webRequest, null);
assertThat(result instanceof Part[]).isTrue();
Part[] parts = (Part[]) result;
assertThat(parts.length).isEqualTo(2);
assertThat(parts).hasSize(2);
assertThat(part1).isEqualTo(parts[0]);
assertThat(part2).isEqualTo(parts[1]);
}

2
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java
View File

@@ -2731,7 +2731,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
vf.afterPropertiesSet();
binder.setValidator(vf);
assertThat(date).isEqualTo("2007-10-02");
assertThat(date2.length).isEqualTo(1);
assertThat(date2).hasSize(1);
assertThat(date2[0]).isEqualTo("2007-10-02");
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
dateFormat.setLenient(false);