diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java index be08dae5a6..24a769ef88 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java @@ -492,6 +492,14 @@ public class StatusResultMatchers { return matcher(HttpStatus.FAILED_DEPENDENCY); } + /** + * Assert the response status code is {@code HttpStatus.TOO_EARLY} (425). + * @since 5.2 + */ + public ResultMatcher isTooEarly() { + return matcher(HttpStatus.valueOf(425)); + } + /** * Assert the response status code is {@code HttpStatus.UPGRADE_REQUIRED} (426). */ diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/result/StatusResultMatchersTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/result/StatusResultMatchersTests.java index 4335f8b39f..78d6787978 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/result/StatusResultMatchersTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/result/StatusResultMatchersTests.java @@ -20,7 +20,6 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; -import org.junit.Before; import org.junit.Test; import org.springframework.core.Conventions; @@ -42,23 +41,14 @@ import static org.assertj.core.api.Assertions.fail; */ public class StatusResultMatchersTests { - private StatusResultMatchers matchers; + private final StatusResultMatchers matchers = new StatusResultMatchers(); - private MockHttpServletRequest request; - - - @Before - public void setup() { - this.matchers = new StatusResultMatchers(); - this.request = new MockHttpServletRequest(); - } + private final MockHttpServletRequest request = new MockHttpServletRequest(); @Test public void testHttpStatusCodeResultMatchers() throws Exception { - List failures = new ArrayList<>(); - for (HttpStatus status : HttpStatus.values()) { MockHttpServletResponse response = new MockHttpServletResponse(); response.setStatus(status.value()); @@ -77,7 +67,6 @@ public class StatusResultMatchersTests { throw new Exception("Failed to obtain ResultMatcher for status " + status, ex); } } - if (!failures.isEmpty()) { fail("Failed status codes: " + failures); }