17
17
package org .springframework .web .servlet .tags ;
18
18
19
19
import java .util .Arrays ;
20
- import java .util .List ;
20
+ import java .util .Collections ;
21
21
22
- import jakarta .servlet .ServletException ;
23
22
import jakarta .servlet .http .HttpServletRequest ;
24
23
import jakarta .servlet .jsp .JspException ;
25
24
import jakarta .servlet .jsp .PageContext ;
28
27
29
28
import org .springframework .context .MessageSourceResolvable ;
30
29
import org .springframework .context .support .DefaultMessageSourceResolvable ;
31
- import org .springframework .web .context .ConfigurableWebApplicationContext ;
32
30
import org .springframework .web .servlet .support .RequestContext ;
33
- import org .springframework .web .servlet .support .RequestContextUtils ;
34
31
import org .springframework .web .util .WebUtils ;
35
32
36
33
import static org .assertj .core .api .Assertions .assertThat ;
@@ -365,23 +362,7 @@ void messageWithVar() throws JspException {
365
362
}
366
363
367
364
@ Test
368
- void nullMessageSource () throws JspException {
369
- PageContext pc = createPageContext ();
370
- ConfigurableWebApplicationContext ctx = (ConfigurableWebApplicationContext )
371
- RequestContextUtils .findWebApplicationContext ((HttpServletRequest ) pc .getRequest (), pc .getServletContext ());
372
- ctx .close ();
373
-
374
- MessageTag tag = new MessageTag ();
375
- tag .setPageContext (pc );
376
- tag .setCode ("test" );
377
- tag .setVar ("testvar2" );
378
- tag .doStartTag ();
379
- assertThat (tag .doEndTag ()).as ("Correct doEndTag return value" ).isEqualTo (Tag .EVAL_PAGE );
380
- }
381
-
382
- @ Test
383
- @ SuppressWarnings ("rawtypes" )
384
- void requestContext () throws ServletException {
365
+ void requestContext () {
385
366
PageContext pc = createPageContext ();
386
367
RequestContext rc = new RequestContext ((HttpServletRequest ) pc .getRequest (), pc .getServletContext ());
387
368
assertThat (rc .getMessage ("test" )).isEqualTo ("test message" );
@@ -391,7 +372,7 @@ void requestContext() throws ServletException {
391
372
assertThat (rc .getMessage ("testArgs" , new String []{"arg1" , "arg2" }, "default" )).isEqualTo ("test arg1 message arg2" );
392
373
assertThat (rc .getMessage ("testArgs" , Arrays .asList ("arg1" , "arg2" ), "default" )).isEqualTo ("test arg1 message arg2" );
393
374
assertThat (rc .getMessage ("testa" , "default" )).isEqualTo ("default" );
394
- assertThat (rc .getMessage ("testa" , ( List ) null , "default" )).isEqualTo ("default" );
375
+ assertThat (rc .getMessage ("testa" , Collections . emptyList () , "default" )).isEqualTo ("default" );
395
376
MessageSourceResolvable resolvable = new DefaultMessageSourceResolvable (new String [] {"test" });
396
377
assertThat (rc .getMessage (resolvable )).isEqualTo ("test message" );
397
378
}
0 commit comments