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

Merge branch '2.0.x'

Browse Source
This commit is contained in:
Andy Wilkinson
2018-11-26 11:30:29 +00:00
parent e1db713169 4bc32e6358
commit c1bbcb6908
6 changed files with 431 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/servlet/WebMvcMetricsAutoConfigurationTests.java
View File

@@ -33,6 +33,7 @@ import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfigu
import org.springframework.boot.actuate.autoconfigure.metrics.test.MetricsRun;
import org.springframework.boot.actuate.autoconfigure.metrics.web.TestController;
import org.springframework.boot.actuate.metrics.web.servlet.DefaultWebMvcTagsProvider;
import org.springframework.boot.actuate.metrics.web.servlet.LongTaskTimingHandlerInterceptor;
import org.springframework.boot.actuate.metrics.web.servlet.WebMvcMetricsFilter;
import org.springframework.boot.actuate.metrics.web.servlet.WebMvcTagsProvider;
import org.springframework.boot.autoconfigure.AutoConfigurations;
@@ -47,6 +48,7 @@ import org.springframework.core.Ordered;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -135,6 +137,20 @@ public class WebMvcMetricsAutoConfigurationTests {
});
}
@Test
@SuppressWarnings("rawtypes")
public void longTaskTimingInterceptorIsRegistered() {
this.contextRunner.withUserConfiguration(TestController.class)
.withConfiguration(AutoConfigurations.of(MetricsAutoConfiguration.class,
WebMvcAutoConfiguration.class))
.run((context) -> {
assertThat(context.getBean(RequestMappingHandlerMapping.class))
.extracting("interceptors").element(0).asList()
.extracting((item) -> (Class) item.getClass())
.contains(LongTaskTimingHandlerInterceptor.class);
});
}
private MeterRegistry getInitializedMeterRegistry(
AssertableWebApplicationContext context) throws Exception {
assertThat(context).hasSingleBean(FilterRegistrationBean.class);