From 49f1aa78eb414eba63f807d29292fd48d7d2cc75 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Wed, 24 Jan 2018 17:37:49 -0500 Subject: [PATCH] Polish --- .../servlet/result/HeaderResultMatchers.java | 20 +++++++++---------- .../resultmatchers/HeaderAssertionTests.java | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) 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 365f43b24e..3b39d59787 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 @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -90,6 +90,15 @@ public class HeaderResultMatchers { }; } + /** + * Assert that the named response header does exist. + * @since 5.0.3 + */ + public ResultMatcher doesExist(final String name) { + return result -> assertTrue("Response should contain header '" + name + "'", + result.getResponse().containsHeader(name)); + } + /** * Assert that the named response header does not exist. * @since 4.0 @@ -99,15 +108,6 @@ public class HeaderResultMatchers { !result.getResponse().containsHeader(name)); } - /** - * Assert that the named response header does exist. - * @since 4.3 - */ - public ResultMatcher doesExist(final String name) { - return result -> assertTrue("Response should contain header '" + name + "'", - result.getResponse().containsHeader(name)); - } - /** * Assert the primary value of the named response header as a {@code long}. *

The {@link ResultMatcher} returned by this method throws an 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 76aed76745..a928b7e10f 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 @@ -159,7 +159,7 @@ public class HeaderAssertionTests { this.mockMvc.perform(get("/persons/1")).andExpect(header().doesExist(LAST_MODIFIED)); } - @Test(expected = AssertionError.class) // SPR-10771 + @Test(expected = AssertionError.class) public void doesExistFail() throws Exception { this.mockMvc.perform(get("/persons/1")).andExpect(header().doesExist("X-Custom-Header")); }