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

MockMvcBuilder supports filter name in addition to initParams

Browse Source 
Closes gh-31474
This commit is contained in:
rstoyanchev
2023-10-24 10:33:29 +01:00
parent ef47eef92a
commit e57b942b4d
6 changed files with 79 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-test/src/test/java/org/springframework/test/web/servlet/setup/MockMvcFilterDecoratorTests.java
View File

@@ -66,14 +66,14 @@ public class MockMvcFilterDecoratorTests {
@Test
public void init() throws Exception {
FilterConfig config = new MockFilterConfig();
filter = new MockMvcFilterDecorator(delegate, null, null, "/");
filter = new MockMvcFilterDecorator(delegate, new String[] {"/"});
filter.init(config);
assertThat(delegate.filterConfig).isEqualTo(config);
}
@Test
public void destroy() {
filter = new MockMvcFilterDecorator(delegate, null, null, "/");
filter = new MockMvcFilterDecorator(delegate, new String[] {"/"});
filter.destroy();
assertThat(delegate.destroy).isTrue();
}
@@ -251,7 +251,7 @@ public class MockMvcFilterDecoratorTests {
request.setDispatcherType(requestDispatcherType);
request.setRequestURI(request.getContextPath() + requestUri);
filter = new MockMvcFilterDecorator(delegate, null, EnumSet.of(filterDispatcherType), pattern);
filter = new MockMvcFilterDecorator(delegate, null, null, EnumSet.of(filterDispatcherType), pattern);
filter.doFilter(request, response, filterChain);
assertThat(delegate.request).isNull();
@@ -265,7 +265,7 @@ public class MockMvcFilterDecoratorTests {
private void assertFilterInvoked(String requestUri, String pattern) throws Exception {
request.setRequestURI(request.getContextPath() + requestUri);
filter = new MockMvcFilterDecorator(delegate, null, null, pattern);
filter = new MockMvcFilterDecorator(delegate, new String[] {pattern});
filter.doFilter(request, response, filterChain);
assertThat(delegate.request).isEqualTo(request);

2
spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java
View File

@@ -134,7 +134,7 @@ class StandaloneMockMvcBuilderTests {
ArgumentCaptor<FilterConfig> captor = ArgumentCaptor.forClass(FilterConfig.class);
MockMvcBuilders.standaloneSetup(new PersonController())
.addFilter(filter, Map.of("p", "v"), EnumSet.of(DispatcherType.REQUEST), "/")
.addFilter(filter, null, Map.of("p", "v"), EnumSet.of(DispatcherType.REQUEST), "/")
.build();
verify(filter, times(1)).init(captor.capture());