4040import org .springframework .util .StreamUtils ;
4141import org .springframework .util .StringUtils ;
4242
43- import static org .junit . jupiter .api .Assertions .* ;
43+ import static org .assertj . core .api .Assertions .assertThat ;
4444import static org .mockito .Mockito .verify ;
4545
4646/**
@@ -63,20 +63,20 @@ void hideFormParameterFromParameterMap() throws ServletException, IOException {
6363 ArgumentCaptor <ServletRequest > captor = ArgumentCaptor .forClass (ServletRequest .class );
6464 verify (chain ).doFilter (captor .capture (), Mockito .eq (response ));
6565 HttpServletRequest servletRequest = (HttpServletRequest ) captor .getValue ();
66- assertEquals ( "foo" , servletRequest .getParameter ("queryArg1" ));
67- assertArrayEquals ( new String []{ "foo" }, servletRequest .getParameterValues ("queryArg1" ));
66+ assertThat ( servletRequest .getParameter ("queryArg1" )). isEqualTo ( "foo" );
67+ assertThat ( servletRequest .getParameterValues ("queryArg1" )). containsExactly ( "foo" );
6868 // "你好" is hello in Chinese
69- assertEquals ( "你好" , servletRequest .getParameter ("queryArg2" ));
70- assertArrayEquals ( new String []{ "你好" }, servletRequest .getParameterValues ("queryArg2" ));
71- assertNull (servletRequest .getParameter ("formArg1" ));
72- assertNull (servletRequest .getParameter ("formArg2" ));
73- assertEquals ( 2 , servletRequest .getParameterMap ().size ());
74- assertEquals ( List . of ( "queryArg1" , "queryArg2" ), toList ( servletRequest . getParameterNames ()) );
75- assertEquals ( " application/x-www-form-urlencoded", servletRequest . getHeader ( "Content-Type" ) );
69+ assertThat ( servletRequest .getParameterValues ("queryArg2" )). containsExactly ( "你好" );
70+ assertThat ( servletRequest .getParameter ("queryArg2" )). isEqualTo ( "你好" );
71+ assertThat (servletRequest .getParameter ("formArg1" )). isNull ( );
72+ assertThat (servletRequest .getParameter ("formArg2" )). isNull ( );
73+ assertThat ( servletRequest .getParameterMap ().size ()). isEqualTo ( 2 );
74+ assertThat ( toList ( servletRequest . getParameterNames ())). containsExactly ( "queryArg1" , "queryArg2" );
75+ assertThat ( servletRequest . getHeader ( "Content-Type" )). isEqualTo ( " application/x-www-form-urlencoded" );
7676 MultiValueMap <String , String > form = readForm (servletRequest );
77- assertEquals ( 2 , form .size ());
78- assertEquals ( List . of ( "bar" ), form . get ( "formArg1" ) );
79- assertEquals ( List . of ( "{}" ), form . get ( "formArg2" ) );
77+ assertThat ( form .size ()). isEqualTo ( 2 );
78+ assertThat ( form . get ( "formArg1" )). containsExactly ( "bar" );
79+ assertThat ( form . get ( "formArg2" )). containsExactly ( "{}" );
8080 }
8181
8282 static MultiValueMap <String , String > readForm (HttpServletRequest request ) {
@@ -109,4 +109,4 @@ static List<String> toList(Enumeration<String> values) {
109109 }
110110 return list ;
111111 }
112- }
112+ }
0 commit comments