Skip to content

Commit d339bbb

Browse files
committed
Remove test for MessageSource access after context close
See gh-31397
1 parent 8d6b499 commit d339bbb

File tree

1 file changed

+3
-22
lines changed

1 file changed

+3
-22
lines changed

spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@
1717
package org.springframework.web.servlet.tags;
1818

1919
import java.util.Arrays;
20-
import java.util.List;
20+
import java.util.Collections;
2121

22-
import jakarta.servlet.ServletException;
2322
import jakarta.servlet.http.HttpServletRequest;
2423
import jakarta.servlet.jsp.JspException;
2524
import jakarta.servlet.jsp.PageContext;
@@ -28,9 +27,7 @@
2827

2928
import org.springframework.context.MessageSourceResolvable;
3029
import org.springframework.context.support.DefaultMessageSourceResolvable;
31-
import org.springframework.web.context.ConfigurableWebApplicationContext;
3230
import org.springframework.web.servlet.support.RequestContext;
33-
import org.springframework.web.servlet.support.RequestContextUtils;
3431
import org.springframework.web.util.WebUtils;
3532

3633
import static org.assertj.core.api.Assertions.assertThat;
@@ -365,23 +362,7 @@ void messageWithVar() throws JspException {
365362
}
366363

367364
@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() {
385366
PageContext pc = createPageContext();
386367
RequestContext rc = new RequestContext((HttpServletRequest) pc.getRequest(), pc.getServletContext());
387368
assertThat(rc.getMessage("test")).isEqualTo("test message");
@@ -391,7 +372,7 @@ void requestContext() throws ServletException {
391372
assertThat(rc.getMessage("testArgs", new String[]{"arg1", "arg2"}, "default")).isEqualTo("test arg1 message arg2");
392373
assertThat(rc.getMessage("testArgs", Arrays.asList("arg1", "arg2"), "default")).isEqualTo("test arg1 message arg2");
393374
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");
395376
MessageSourceResolvable resolvable = new DefaultMessageSourceResolvable(new String[] {"test"});
396377
assertThat(rc.getMessage(resolvable)).isEqualTo("test message");
397378
}

0 commit comments

Comments
 (0)