From c03def79d4f34c33cf8b4b2531fd3d7f52779106 Mon Sep 17 00:00:00 2001 From: rstoyanchev Date: Mon, 28 Feb 2022 14:17:04 +0000 Subject: [PATCH] Fix test failures See gh-27052 --- .../annotation/ResponseStatusExceptionResolverTests.java | 2 +- .../mvc/support/DefaultHandlerExceptionResolverTests.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolverTests.java index 7e9338fa8a0..eee6f72b9a7 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolverTests.java @@ -139,7 +139,7 @@ public class ResponseStatusExceptionResolverTests { ModelAndView mav = exceptionResolver.resolveException(request, response, null, ex); - assertResolved(mav, 405, "Request method 'GET' not supported"); + assertResolved(mav, 405, "Request method 'GET' is not supported."); assertThat(response.getHeader(HttpHeaders.ALLOW)).isEqualTo("POST,PUT"); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolverTests.java index f910a54289c..dbaee4d7090 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolverTests.java @@ -113,7 +113,7 @@ public class DefaultHandlerExceptionResolverTests { assertThat(mav).as("No ModelAndView returned").isNotNull(); assertThat(mav.isEmpty()).as("No Empty ModelAndView returned").isTrue(); assertThat(response.getStatus()).as("Invalid status code").isEqualTo(500); - assertThat(response.getErrorMessage()).isEqualTo("Required URI variable 'foo' is not present"); + assertThat(response.getErrorMessage()).isEqualTo("Required path variable 'foo' is not present."); } @Test @@ -123,7 +123,7 @@ public class DefaultHandlerExceptionResolverTests { assertThat(mav).as("No ModelAndView returned").isNotNull(); assertThat(mav.isEmpty()).as("No Empty ModelAndView returned").isTrue(); assertThat(response.getStatus()).as("Invalid status code").isEqualTo(400); - assertThat(response.getErrorMessage()).isEqualTo("Required parameter 'foo' is not present"); + assertThat(response.getErrorMessage()).isEqualTo("Required parameter 'foo' is not present."); } @Test @@ -183,7 +183,7 @@ public class DefaultHandlerExceptionResolverTests { assertThat(mav).as("No ModelAndView returned").isNotNull(); assertThat(mav.isEmpty()).as("No Empty ModelAndView returned").isTrue(); assertThat(response.getStatus()).as("Invalid status code").isEqualTo(400); - assertThat(response.getErrorMessage().contains("request part")).isTrue(); + assertThat(response.getErrorMessage().contains("part")).isTrue(); assertThat(response.getErrorMessage().contains("name")).isTrue(); assertThat(response.getErrorMessage().contains("not present")).isTrue(); }