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

Merge branch '2.0.x' into 2.1.x

Browse Source
This commit is contained in:
Andy Wilkinson
2019-03-11 16:00:22 +00:00
parent f574213cc8 361437f4e2
commit 8c3cec8f13
26 changed files with 78 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2018 the original author or authors.
* Copyright 2012-2019 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.
@@ -28,6 +28,7 @@ import org.junit.Test;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.mock.web.MockServletContext;
import org.springframework.test.util.ReflectionTestUtils;
import org.springframework.test.web.servlet.setup.DefaultMockMvcBuilder;
@@ -65,6 +66,7 @@ public class SpringBootMockMvcBuilderCustomizerTests {
assertThat(filters).containsExactlyInAnyOrder(testFilter, otherTestFilter);
}
@Configuration
static class ServletConfiguration {
@Bean
@@ -74,6 +76,7 @@ public class SpringBootMockMvcBuilderCustomizerTests {
}
@Configuration
static class FilterConfiguration {
@Bean