diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/HeaderAssertions.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/HeaderAssertions.java index 19db07df29..846cf20b90 100644 --- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/HeaderAssertions.java +++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/HeaderAssertions.java @@ -77,7 +77,7 @@ public class HeaderAssertions { * Expect that the header with the given name is present. * @since 5.0.3 */ - public WebTestClient.ResponseSpec doesExist(String name) { + public WebTestClient.ResponseSpec exists(String name) { if (!getHeaders().containsKey(name)) { String message = getMessage(name) + " does not exist"; this.exchangeResult.assertWithDiagnostics(() -> fail(message)); diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/result/HeaderResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/HeaderResultMatchers.java index 3b39d59787..d4a10fdf35 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/result/HeaderResultMatchers.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/result/HeaderResultMatchers.java @@ -91,10 +91,10 @@ public class HeaderResultMatchers { } /** - * Assert that the named response header does exist. + * Assert that the named response header exists. * @since 5.0.3 */ - public ResultMatcher doesExist(final String name) { + public ResultMatcher exists(final String name) { return result -> assertTrue("Response should contain header '" + name + "'", result.getResponse().containsHeader(name)); } diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/HeaderAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/HeaderAssertionTests.java index 01b40b7d50..b920fbbcd6 100644 --- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/HeaderAssertionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/HeaderAssertionTests.java @@ -126,16 +126,16 @@ public class HeaderAssertionTests { } @Test - public void doesExist() { + public void exists() { HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_JSON_UTF8); HeaderAssertions assertions = headerAssertions(headers); // Success - assertions.doesExist("Content-Type"); + assertions.exists("Content-Type"); try { - assertions.doesExist("Framework"); + assertions.exists("Framework"); fail("Header should not exist"); } catch (AssertionError error) { diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HeaderAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HeaderAssertionTests.java index e489085691..7f815d9bcb 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HeaderAssertionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HeaderAssertionTests.java @@ -144,6 +144,16 @@ public class HeaderAssertionTests { } } + @Test + public void exists() throws Exception { + this.mockMvc.perform(get("/persons/1")).andExpect(header().exists(LAST_MODIFIED)); + } + + @Test(expected = AssertionError.class) + public void existsFail() throws Exception { + this.mockMvc.perform(get("/persons/1")).andExpect(header().exists("X-Custom-Header")); + } + @Test // SPR-10771 public void doesNotExist() throws Exception { this.mockMvc.perform(get("/persons/1")).andExpect(header().doesNotExist("X-Custom-Header")); @@ -154,16 +164,6 @@ public class HeaderAssertionTests { this.mockMvc.perform(get("/persons/1")).andExpect(header().doesNotExist(LAST_MODIFIED)); } - @Test - public void doesExist() throws Exception { - this.mockMvc.perform(get("/persons/1")).andExpect(header().doesExist(LAST_MODIFIED)); - } - - @Test(expected = AssertionError.class) - public void doesExistFail() throws Exception { - this.mockMvc.perform(get("/persons/1")).andExpect(header().doesExist("X-Custom-Header")); - } - @Test public void stringWithIncorrectResponseHeaderValue() throws Exception { assertIncorrectResponseHeader(header().string(LAST_MODIFIED, secondLater), secondLater);