From 10c55ff9125fe80aeb12c9031d0727b8077e8a3f Mon Sep 17 00:00:00 2001 From: Spring Builds Date: Wed, 11 May 2022 07:08:24 +0000 Subject: [PATCH 1/3] Next development version (v5.3.21-SNAPSHOT) --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a03487da791..146d71973a4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=5.3.20-SNAPSHOT +version=5.3.21-SNAPSHOT org.gradle.jvmargs=-Xmx1536M org.gradle.caching=true org.gradle.parallel=true From 745eb1a88174a09b9ab6e735ac44e538dec42b85 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Wed, 11 May 2022 15:59:47 +0200 Subject: [PATCH 2/3] Polish DispatcherServletTests --- .../web/servlet/DispatcherServletTests.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java index adbae39e5fe..8a1621a652c 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -170,7 +170,7 @@ public class DispatcherServletTests { request.addUserRole("role1"); MockHttpServletResponse response = new MockHttpServletResponse(); 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 @@ -198,7 +198,7 @@ public class DispatcherServletTests { MockHttpServletRequest request = new MockHttpServletRequest(getServletContext(), "GET", "/unknown.do"); MockHttpServletResponse response = new MockHttpServletResponse(); 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(); } @@ -263,10 +263,10 @@ public class DispatcherServletTests { request.setAttribute("fail", Boolean.TRUE); MockHttpServletResponse response = new MockHttpServletResponse(); 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(request.getAttribute( - SimpleMappingExceptionResolver.DEFAULT_EXCEPTION_ATTRIBUTE) instanceof MaxUploadSizeExceededException).as("correct exception").isTrue(); + assertThat(request.getAttribute(SimpleMappingExceptionResolver.DEFAULT_EXCEPTION_ATTRIBUTE)) + .isInstanceOf(MaxUploadSizeExceededException.class); } @Test @@ -295,7 +295,7 @@ public class DispatcherServletTests { MockHttpServletResponse response = new MockHttpServletResponse(); complexDispatcherServlet.service(request, response); 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 @@ -307,7 +307,7 @@ public class DispatcherServletTests { MockHttpServletResponse response = new MockHttpServletResponse(); complexDispatcherServlet.service(request, response); 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(); } @@ -320,7 +320,7 @@ public class DispatcherServletTests { MockHttpServletResponse response = new MockHttpServletResponse(); complexDispatcherServlet.service(request, response); 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(); } @@ -333,7 +333,7 @@ public class DispatcherServletTests { MockHttpServletResponse response = new MockHttpServletResponse(); complexDispatcherServlet.service(request, response); 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(); } @@ -346,7 +346,7 @@ public class DispatcherServletTests { MockHttpServletResponse response = new MockHttpServletResponse(); complexDispatcherServlet.service(request, response); 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(); } @@ -359,7 +359,7 @@ public class DispatcherServletTests { MockHttpServletResponse response = new MockHttpServletResponse(); complexDispatcherServlet.service(request, response); 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(); } @@ -372,7 +372,7 @@ public class DispatcherServletTests { MockHttpServletResponse response = new MockHttpServletResponse(); complexDispatcherServlet.service(request, response); 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(); } @@ -397,7 +397,7 @@ public class DispatcherServletTests { MockHttpServletResponse response = new MockHttpServletResponse(); complexDispatcherServlet.service(request, response); 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(); } From 06679a5583e6e5bbd8ec10a12f665cdfc561cc19 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Wed, 11 May 2022 16:00:21 +0200 Subject: [PATCH 3/3] Fix tests in DispatcherServletTests See gh-28424 --- .../web/servlet/DispatcherServletTests.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java index 8a1621a652c..61cc4ec1aec 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java @@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; import javax.servlet.http.HttpServletResponse; +import org.assertj.core.api.InstanceOfAssertFactories; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -519,7 +520,10 @@ public class DispatcherServletTests { request = new MockHttpServletRequest(getServletContext(), "GET", "/form.do"); response = new MockHttpServletResponse(); + request.addParameter("fail", "yes"); complexDispatcherServlet.service(request, response); + assertThat(response.getForwardedUrl()).as("forwarded URL").isEqualTo("failed1.jsp"); + assertThat(request.getAttribute("exception")).isNull(); } @Test @@ -536,12 +540,15 @@ public class DispatcherServletTests { complexDispatcherServlet.service(request, response); assertThat(response.getContentAsString()).isEqualTo("body"); - // SimpleControllerHandlerAdapter not detected + // MyHandlerAdapter not detected request = new MockHttpServletRequest(getServletContext(), "GET", "/form.do"); response = new MockHttpServletResponse(); + request.addParameter("fail", "yes"); complexDispatcherServlet.service(request, response); - assertThat(response.getForwardedUrl()).as("forwarded to failed").isEqualTo("failed0.jsp"); - assertThat(request.getAttribute("exception").getClass().equals(ServletException.class)).as("Exception exposed").isTrue(); + assertThat(response.getForwardedUrl()).as("forwarded URL").isEqualTo("failed0.jsp"); + assertThat(request.getAttribute("exception")) + .asInstanceOf(InstanceOfAssertFactories.type(ServletException.class)) + .extracting(Throwable::getMessage).asString().startsWith("No adapter for handler"); } @Test