Browse Source

Fix test failures

See gh-27052
pull/28113/head
rstoyanchev 4 years ago
parent
commit
c03def79d4
  1. 2
      spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolverTests.java
  2. 6
      spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolverTests.java

2
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolverTests.java

@ -139,7 +139,7 @@ public class ResponseStatusExceptionResolverTests { @@ -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");
}

6
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolverTests.java

@ -113,7 +113,7 @@ public class DefaultHandlerExceptionResolverTests { @@ -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 { @@ -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 { @@ -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();
}

Loading…
Cancel
Save