root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fix tests in DispatcherServletTests 

See gh-28424
This commit is contained in:
Sam Brannen 2022-05-11 16:00:21 +02:00
parent 745eb1a881
commit 06679a5583
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java
View File

@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper; import javax.servlet.http.HttpServletRequestWrapper;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.assertj.core.api.InstanceOfAssertFactories;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@ -519,7 +520,10 @@ public class DispatcherServletTests {
request = new MockHttpServletRequest(getServletContext(), "GET", "/form.do"); request = new MockHttpServletRequest(getServletContext(), "GET", "/form.do");
response = new MockHttpServletResponse(); response = new MockHttpServletResponse();
request.addParameter("fail", "yes");
complexDispatcherServlet.service(request, response); complexDispatcherServlet.service(request, response);
assertThat(response.getForwardedUrl()).as("forwarded URL").isEqualTo("failed1.jsp");
assertThat(request.getAttribute("exception")).isNull();
} }
@Test @Test
@ -536,12 +540,15 @@ public class DispatcherServletTests {
complexDispatcherServlet.service(request, response); complexDispatcherServlet.service(request, response);
assertThat(response.getContentAsString()).isEqualTo("body"); assertThat(response.getContentAsString()).isEqualTo("body");
// SimpleControllerHandlerAdapter not detected // MyHandlerAdapter not detected
request = new MockHttpServletRequest(getServletContext(), "GET", "/form.do"); request = new MockHttpServletRequest(getServletContext(), "GET", "/form.do");
response = new MockHttpServletResponse(); response = new MockHttpServletResponse();
request.addParameter("fail", "yes");
complexDispatcherServlet.service(request, response); complexDispatcherServlet.service(request, response);
assertThat(response.getForwardedUrl()).as("forwarded to failed").isEqualTo("failed0.jsp"); assertThat(response.getForwardedUrl()).as("forwarded URL").isEqualTo("failed0.jsp");
assertThat(request.getAttribute("exception").getClass().equals(ServletException.class)).as("Exception exposed").isTrue(); assertThat(request.getAttribute("exception"))
.asInstanceOf(InstanceOfAssertFactories.type(ServletException.class))
.extracting(Throwable::getMessage).asString().startsWith("No adapter for handler");
} }
@Test @Test