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

CharacterEncodingFilter provides convenience constructors for Servlet 3.0 style usage

Browse Source 
Issue: SPR-13572
This commit is contained in:
Juergen Hoeller
2015-10-26 22:48:54 +01:00
parent 11d1f050e9
commit 64a8dfbd12
2 changed files with 42 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-web/src/test/java/org/springframework/web/filter/CharacterEncodingFilterTests.java
View File

@@ -32,6 +32,7 @@ import static org.mockito.BDDMockito.*;
/**
* @author Rick Evans
* @author Juergen Hoeller
* @author Vedran Pavic
*/
public class CharacterEncodingFilterTests {
@@ -50,9 +51,7 @@ public class CharacterEncodingFilterTests {
HttpServletResponse response = mock(HttpServletResponse.class);
FilterChain filterChain = mock(FilterChain.class);
CharacterEncodingFilter filter = new CharacterEncodingFilter();
filter.setForceEncoding(true);
filter.setEncoding(ENCODING);
CharacterEncodingFilter filter = new CharacterEncodingFilter(ENCODING, true);
filter.init(new MockFilterConfig(FILTER_NAME));
filter.doFilter(request, response, filterChain);
@@ -73,9 +72,7 @@ public class CharacterEncodingFilterTests {
FilterChain filterChain = mock(FilterChain.class);
CharacterEncodingFilter filter = new CharacterEncodingFilter();
filter.setForceEncoding(false);
filter.setEncoding(ENCODING);
CharacterEncodingFilter filter = new CharacterEncodingFilter(ENCODING);
filter.init(new MockFilterConfig(FILTER_NAME));
filter.doFilter(request, response, filterChain);
@@ -86,7 +83,7 @@ public class CharacterEncodingFilterTests {
}
@Test
public void doesNowtIfEncodingIsNotEmptyAndNotForced() throws Exception {
public void doesNotIfEncodingIsNotEmptyAndNotForced() throws Exception {
HttpServletRequest request = mock(HttpServletRequest.class);
given(request.getCharacterEncoding()).willReturn(ENCODING);
given(request.getAttribute(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE)).willReturn(null);
@@ -96,8 +93,7 @@ public class CharacterEncodingFilterTests {
FilterChain filterChain = mock(FilterChain.class);
CharacterEncodingFilter filter = new CharacterEncodingFilter();
filter.setEncoding(ENCODING);
CharacterEncodingFilter filter = new CharacterEncodingFilter(ENCODING);
filter.init(new MockFilterConfig(FILTER_NAME));
filter.doFilter(request, response, filterChain);
@@ -140,8 +136,7 @@ public class CharacterEncodingFilterTests {
FilterChain filterChain = mock(FilterChain.class);
CharacterEncodingFilter filter = new CharacterEncodingFilter();
filter.setEncoding(ENCODING);
CharacterEncodingFilter filter = new CharacterEncodingFilter(ENCODING);
filter.doFilter(request, response, filterChain);
verify(request).setCharacterEncoding(ENCODING);