root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fix tests after HandlerExceptionResolver logging changes 

See gh-14936
This commit is contained in:
Brian Clozel 2018-10-23 15:34:06 +02:00
parent 45a0bfd870
commit 1651690d57
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java
View File

@ -90,6 +90,7 @@ import org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver;
import org.springframework.web.servlet.i18n.FixedLocaleResolver; import org.springframework.web.servlet.i18n.FixedLocaleResolver;
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
import org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolver;
import org.springframework.web.servlet.resource.AppCacheManifestTransformer; import org.springframework.web.servlet.resource.AppCacheManifestTransformer;
import org.springframework.web.servlet.resource.CachingResourceResolver; import org.springframework.web.servlet.resource.CachingResourceResolver;
import org.springframework.web.servlet.resource.CachingResourceTransformer; import org.springframework.web.servlet.resource.CachingResourceTransformer;
@ -646,7 +647,8 @@ public class WebMvcAutoConfigurationTests {
List<HandlerExceptionResolver> delegates = ((HandlerExceptionResolverComposite) resolver) List<HandlerExceptionResolver> delegates = ((HandlerExceptionResolverComposite) resolver)
.getExceptionResolvers(); .getExceptionResolvers();
for (HandlerExceptionResolver delegate : delegates) { for (HandlerExceptionResolver delegate : delegates) {
if (delegate instanceof AbstractHandlerExceptionResolver) { if (delegate instanceof AbstractHandlerExceptionResolver
&& !(delegate instanceof DefaultHandlerExceptionResolver)) {
consumer.accept(ReflectionTestUtils.getField(delegate, "warnLogger")); consumer.accept(ReflectionTestUtils.getField(delegate, "warnLogger"));
} }
} }