Fix tests after HandlerExceptionResolver logging changes

See gh-14936 and gh-15189
This commit is contained in:
Andy Wilkinson 2018-11-22 20:27:19 +00:00
parent 97f7984812
commit 3bda78a3d3
1 changed files with 3 additions and 1 deletions

View File

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