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

Polish DispatcherServletTests

This commit is contained in:
Sam Brannen 2022-05-11 15:59:47 +02:00
parent 10c55ff912
commit 745eb1a881
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2020 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -170,7 +170,7 @@ public class DispatcherServletTests {
request.addUserRole("role1"); request.addUserRole("role1");
MockHttpServletResponse response = new MockHttpServletResponse(); MockHttpServletResponse response = new MockHttpServletResponse();
complexDispatcherServlet.service(request, response); complexDispatcherServlet.service(request, response);
assertThat("myform.jsp".equals(response.getForwardedUrl())).as("forwarded to form").isTrue(); assertThat(response.getForwardedUrl()).as("forwarded URL").isEqualTo("myform.jsp");
} }
@Test @Test
@ -198,7 +198,7 @@ public class DispatcherServletTests {
MockHttpServletRequest request = new MockHttpServletRequest(getServletContext(), "GET", "/unknown.do"); MockHttpServletRequest request = new MockHttpServletRequest(getServletContext(), "GET", "/unknown.do");
MockHttpServletResponse response = new MockHttpServletResponse(); MockHttpServletResponse response = new MockHttpServletResponse();
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").getClass().equals(ServletException.class)).as("Exception exposed").isTrue();
} }
@ -263,10 +263,10 @@ public class DispatcherServletTests {
request.setAttribute("fail", Boolean.TRUE); request.setAttribute("fail", Boolean.TRUE);
MockHttpServletResponse response = new MockHttpServletResponse(); MockHttpServletResponse response = new MockHttpServletResponse();
complexDispatcherServlet.service(request, response); complexDispatcherServlet.service(request, response);
assertThat("failed0.jsp".equals(response.getForwardedUrl())).as("forwarded to failed").isTrue(); assertThat(response.getForwardedUrl()).as("forwarded URL").isEqualTo("failed0.jsp");
assertThat(response.getStatus()).isEqualTo(200); assertThat(response.getStatus()).isEqualTo(200);
assertThat(request.getAttribute( assertThat(request.getAttribute(SimpleMappingExceptionResolver.DEFAULT_EXCEPTION_ATTRIBUTE))
SimpleMappingExceptionResolver.DEFAULT_EXCEPTION_ATTRIBUTE) instanceof MaxUploadSizeExceededException).as("correct exception").isTrue(); .isInstanceOf(MaxUploadSizeExceededException.class);
} }
@Test @Test
@ -295,7 +295,7 @@ public class DispatcherServletTests {
MockHttpServletResponse response = new MockHttpServletResponse(); MockHttpServletResponse response = new MockHttpServletResponse();
complexDispatcherServlet.service(request, response); complexDispatcherServlet.service(request, response);
assertThat(response.getStatus()).isEqualTo(200); assertThat(response.getStatus()).isEqualTo(200);
assertThat("failed1.jsp".equals(response.getForwardedUrl())).as("forwarded to failed").isTrue(); assertThat(response.getForwardedUrl()).as("forwarded URL").isEqualTo("failed1.jsp");
} }
@Test @Test
@ -307,7 +307,7 @@ public class DispatcherServletTests {
MockHttpServletResponse response = new MockHttpServletResponse(); MockHttpServletResponse response = new MockHttpServletResponse();
complexDispatcherServlet.service(request, response); complexDispatcherServlet.service(request, response);
assertThat(response.getStatus()).isEqualTo(200); assertThat(response.getStatus()).isEqualTo(200);
assertThat(response.getForwardedUrl()).as("forwarded to failed").isEqualTo("failed2.jsp"); assertThat(response.getForwardedUrl()).as("forwarded URL").isEqualTo("failed2.jsp");
assertThat(request.getAttribute("exception") instanceof IllegalAccessException).as("Exception exposed").isTrue(); assertThat(request.getAttribute("exception") instanceof IllegalAccessException).as("Exception exposed").isTrue();
} }
@ -320,7 +320,7 @@ public class DispatcherServletTests {
MockHttpServletResponse response = new MockHttpServletResponse(); MockHttpServletResponse response = new MockHttpServletResponse();
complexDispatcherServlet.service(request, response); complexDispatcherServlet.service(request, response);
assertThat(response.getStatus()).isEqualTo(200); assertThat(response.getStatus()).isEqualTo(200);
assertThat(response.getForwardedUrl()).as("forwarded to failed").isEqualTo("failed3.jsp"); assertThat(response.getForwardedUrl()).as("forwarded URL").isEqualTo("failed3.jsp");
assertThat(request.getAttribute("exception") instanceof ServletException).as("Exception exposed").isTrue(); assertThat(request.getAttribute("exception") instanceof ServletException).as("Exception exposed").isTrue();
} }
@ -333,7 +333,7 @@ public class DispatcherServletTests {
MockHttpServletResponse response = new MockHttpServletResponse(); MockHttpServletResponse response = new MockHttpServletResponse();
complexDispatcherServlet.service(request, response); complexDispatcherServlet.service(request, response);
assertThat(response.getStatus()).isEqualTo(500); assertThat(response.getStatus()).isEqualTo(500);
assertThat(response.getForwardedUrl()).as("forwarded to failed").isEqualTo("failed1.jsp"); assertThat(response.getForwardedUrl()).as("forwarded URL").isEqualTo("failed1.jsp");
assertThat(request.getAttribute("exception") instanceof IllegalAccessException).as("Exception exposed").isTrue(); assertThat(request.getAttribute("exception") instanceof IllegalAccessException).as("Exception exposed").isTrue();
} }
@ -346,7 +346,7 @@ public class DispatcherServletTests {
MockHttpServletResponse response = new MockHttpServletResponse(); MockHttpServletResponse response = new MockHttpServletResponse();
complexDispatcherServlet.service(request, response); complexDispatcherServlet.service(request, response);
assertThat(response.getStatus()).isEqualTo(500); assertThat(response.getStatus()).isEqualTo(500);
assertThat(response.getForwardedUrl()).as("forwarded to failed").isEqualTo("failed1.jsp"); assertThat(response.getForwardedUrl()).as("forwarded URL").isEqualTo("failed1.jsp");
assertThat(request.getAttribute("exception") instanceof ServletException).as("Exception exposed").isTrue(); assertThat(request.getAttribute("exception") instanceof ServletException).as("Exception exposed").isTrue();
} }
@ -359,7 +359,7 @@ public class DispatcherServletTests {
MockHttpServletResponse response = new MockHttpServletResponse(); MockHttpServletResponse response = new MockHttpServletResponse();
complexDispatcherServlet.service(request, response); complexDispatcherServlet.service(request, response);
assertThat(response.getStatus()).isEqualTo(200); assertThat(response.getStatus()).isEqualTo(200);
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(RuntimeException.class)).as("Exception exposed").isTrue(); assertThat(request.getAttribute("exception").getClass().equals(RuntimeException.class)).as("Exception exposed").isTrue();
} }
@ -372,7 +372,7 @@ public class DispatcherServletTests {
MockHttpServletResponse response = new MockHttpServletResponse(); MockHttpServletResponse response = new MockHttpServletResponse();
complexDispatcherServlet.service(request, response); complexDispatcherServlet.service(request, response);
assertThat(response.getStatus()).isEqualTo(200); assertThat(response.getStatus()).isEqualTo(200);
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").getClass().equals(ServletException.class)).as("Exception exposed").isTrue();
} }
@ -397,7 +397,7 @@ public class DispatcherServletTests {
MockHttpServletResponse response = new MockHttpServletResponse(); MockHttpServletResponse response = new MockHttpServletResponse();
complexDispatcherServlet.service(request, response); complexDispatcherServlet.service(request, response);
assertThat(response.getStatus()).isEqualTo(200); assertThat(response.getStatus()).isEqualTo(200);
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").getClass().equals(ServletException.class)).as("Exception exposed").isTrue();
} }