Commit 2b22b23a authored by Andy Wilkinson's avatar Andy Wilkinson

Polish

parent 6f07155d
...@@ -150,12 +150,11 @@ public class WebMvcMetricsAutoConfigurationTests { ...@@ -150,12 +150,11 @@ public class WebMvcMetricsAutoConfigurationTests {
MeterRegistryConfiguration.class) MeterRegistryConfiguration.class)
.withConfiguration(AutoConfigurations.of(MetricsAutoConfiguration.class, .withConfiguration(AutoConfigurations.of(MetricsAutoConfiguration.class,
WebMvcAutoConfiguration.class)) WebMvcAutoConfiguration.class))
.run((context) -> { .run((context) -> assertThat(
assertThat(context.getBean(RequestMappingHandlerMapping.class)) context.getBean(RequestMappingHandlerMapping.class))
.extracting("interceptors").element(0).asList() .extracting("interceptors").element(0).asList()
.extracting((item) -> (Class) item.getClass()) .extracting((item) -> (Class) item.getClass())
.contains(LongTaskTimingHandlerInterceptor.class); .contains(LongTaskTimingHandlerInterceptor.class));
});
} }
private MeterRegistry getInitializedMeterRegistry( private MeterRegistry getInitializedMeterRegistry(
......
/*
* Copyright 2012-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
* Spring Boot specific {@link org.springframework.web.server.WebFilter} implementations.
*/
package org.springframework.boot.web.reactive.filter;
...@@ -437,9 +437,8 @@ public class TomcatServletWebServerFactoryTests ...@@ -437,9 +437,8 @@ public class TomcatServletWebServerFactoryTests
((StandardContext) context).setFailCtxIfServletStartFails(true); ((StandardContext) context).setFailCtxIfServletStartFails(true);
} }
}); });
this.webServer = factory.getWebServer((context) -> { this.webServer = factory.getWebServer((context) -> context
context.addServlet("failing", FailingServlet.class).setLoadOnStartup(0); .addServlet("failing", FailingServlet.class).setLoadOnStartup(0));
});
this.thrown.expect(WebServerException.class); this.thrown.expect(WebServerException.class);
this.webServer.start(); this.webServer.start();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment