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

Use AssertJ's hasSize() for collections and maps

Browse Source 
Achieved via a global search-and-replace.
This commit is contained in:
Sam Brannen
2022-11-22 16:50:10 +01:00
parent f9f8f2d89e
commit 36f7597f25
237 changed files with 1161 additions and 1172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java
View File

@@ -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();
}

6
spring-webmvc/src/test/java/org/springframework/web/servlet/FlashMapTests.java
View File

@@ -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");
}

4
spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java
View File

@@ -123,7 +123,7 @@ public class AnnotationDrivenBeanDefinitionParserTests {
assertThat(value instanceof List).isTrue();
@SuppressWarnings("unchecked")
List<HandlerMethodArgumentResolver> resolvers = (List<HandlerMethodArgumentResolver>) 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<HandlerMethodReturnValueHandler> handlers = (List<HandlerMethodReturnValueHandler>) 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));

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

@@ -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<Resource, Charset> locationCharsets = pathResolver.getLocationCharsets();
assertThat(locationCharsets.size()).isEqualTo(1);
assertThat(locationCharsets).hasSize(1);
assertThat(locationCharsets.values().iterator().next()).isEqualTo(StandardCharsets.ISO_8859_1);
List<ResourceTransformer> 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<ViewResolver> 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<String, CorsConfiguration> 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<String, CorsConfiguration> 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"});

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

@@ -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<String, CorsConfiguration> 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<String, CorsConfiguration> 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("*"));

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

@@ -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;

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

@@ -105,7 +105,7 @@ public class InterceptorRegistryTests {
this.registry.addWebRequestInterceptor(this.webInterceptor1);
List<HandlerInterceptor> 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<HandlerInterceptor> 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<HandlerInterceptor> 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<Object> 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<Object> 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);

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

@@ -231,7 +231,7 @@ public class ResourceHandlerRegistryTests {
List<ResourceResolver> resolvers = handler.getResourceResolvers();
PathResourceResolver resolver = (PathResourceResolver) resolvers.get(resolvers.size()-1);
Map<Resource, Charset> locationCharsets = resolver.getLocationCharsets();
assertThat(locationCharsets.size()).isEqualTo(1);
assertThat(locationCharsets).hasSize(1);
assertThat(locationCharsets.values().iterator().next()).isEqualTo(StandardCharsets.ISO_8859_1);
}

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

@@ -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 extends ViewResolver> T checkAndGetResolver(Class<T> 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);
}

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

@@ -144,7 +144,7 @@ public class WebMvcConfigurationSupportExtensionTests {
assertThat(interceptors[3].getClass()).isEqualTo(ResourceUrlProviderExposingInterceptor.class);
Map<RequestMappingInfo, HandlerMethod> 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<HttpMessageConverter<?>> 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<HandlerMethodArgumentResolver> argResolvers =
(List<HandlerMethodArgumentResolver>) fieldAccessor.getPropertyValue("customArgumentResolvers");
assertThat(argResolvers.size()).isEqualTo(1);
assertThat(argResolvers).hasSize(1);
List<HandlerMethodReturnValueHandler> handlers =
(List<HandlerMethodReturnValueHandler>) 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<HandlerExceptionResolver> 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<ViewResolver> 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<View> defaultViews = (List<View>) 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<ViewResolver>) 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<String, CorsConfiguration> configs = this.config.getCorsConfigurations();
assertThat(configs.size()).isEqualTo(1);
assertThat(configs).hasSize(1);
assertThat(configs.get("/resources/**").getAllowedOrigins().get(0)).isEqualTo("*");
}

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

@@ -203,7 +203,7 @@ public class WebMvcConfigurationSupportTests {
DirectFieldAccessor fieldAccessor = new DirectFieldAccessor(adapter);
@SuppressWarnings("unchecked")
List<Object> bodyAdvice = (List<Object>) 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<Object> interceptors = (List<Object>) 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);
}

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

@@ -283,7 +283,7 @@ class DefaultServerRequestTests {
Collections.singletonList(new MappingJackson2HttpMessageConverter()));
List<String> result = request.body(new ParameterizedTypeReference<List<String>>() {});
assertThat(result.size()).isEqualTo(2);
assertThat(result).hasSize(2);
assertThat(result.get(0)).isEqualTo("foo");
assertThat(result.get(1)).isEqualTo("bar");
}

14
spring-webmvc/src/test/java/org/springframework/web/servlet/handler/HandlerMethodMappingTests.java
View File

@@ -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<String> 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<String> 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<HandlerMethod> 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<String> 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<HandlerMethod> 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);
}

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

@@ -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");
}

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

@@ -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");
}

2
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/HeadersRequestConditionTests.java
View File

@@ -161,7 +161,7 @@ public class HeadersRequestConditionTests {
HeadersRequestCondition result = condition1.combine(condition2);
Collection<HeaderExpression> conditions = result.getContent();
assertThat(conditions.size()).isEqualTo(2);
assertThat(conditions).hasSize(2);
}
@Test

2
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ParamsRequestConditionTests.java
View File

@@ -130,7 +130,7 @@ public class ParamsRequestConditionTests {
ParamsRequestCondition result = condition1.combine(condition2);
Collection<ParamExpression> conditions = result.getContent();
assertThat(conditions.size()).isEqualTo(2);
assertThat(conditions).hasSize(2);
}
}

2
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestConditionTests.java
View File

@@ -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);
}

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

@@ -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");

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

@@ -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();

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

@@ -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);
}

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

@@ -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));
}
}

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

@@ -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");
}

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

@@ -98,7 +98,7 @@ public class PathVariableMethodArgumentResolverTests {
@SuppressWarnings("unchecked")
Map<String, Object> pathVars = (Map<String, Object>) 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<String, Object> pathVars = (Map<String, Object>) 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<String, Object> pathVars = (Map<String, Object>) 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<String, Object> pathVars = (Map<String, Object>) 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");
}

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

@@ -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);
}

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

@@ -299,11 +299,11 @@ public class RequestMappingHandlerMappingTests {
assertThat(info).isNotNull();
Set<String> paths = info.getPatternValues();
assertThat(paths.size()).isEqualTo(1);
assertThat(paths).hasSize(1);
assertThat(paths.iterator().next()).isEqualTo(path);
Set<RequestMethod> methods = info.getMethodsCondition().getMethods();
assertThat(methods.size()).isEqualTo(1);
assertThat(methods).hasSize(1);
assertThat(methods.iterator().next()).isEqualTo(requestMethod);
return info;

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

@@ -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) {

8
spring-webmvc/src/test/java/org/springframework/web/servlet/support/AnnotationConfigDispatcherServletInitializerTests.java
View File

@@ -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);
}

4
spring-webmvc/src/test/java/org/springframework/web/servlet/support/DispatcherServletInitializerTests.java
View File

@@ -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);

14
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java
View File

@@ -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();
}

2
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java
View File

@@ -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();

4
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java
View File

@@ -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");

6
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java
View File

@@ -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");

26
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
View File

@@ -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");

14
spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java
View File

@@ -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);
}
/**