From aac4dbf42067c3e152bcf9ede9f03a6520006b41 Mon Sep 17 00:00:00 2001
From: Johnny Lim <izeye@naver.com>
Date: Sun, 19 Jan 2025 23:04:57 +0900
Subject: [PATCH 1/2] Polish HttpHeadersAssert

See gh-34286

Signed-off-by: Johnny Lim <izeye@naver.com>
---
 .../org/springframework/test/http/HttpHeadersAssert.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/http/HttpHeadersAssert.java b/spring-test/src/main/java/org/springframework/test/http/HttpHeadersAssert.java
index 7e43b42f19..ec6d984dc8 100644
--- a/spring-test/src/main/java/org/springframework/test/http/HttpHeadersAssert.java
+++ b/spring-test/src/main/java/org/springframework/test/http/HttpHeadersAssert.java
@@ -100,7 +100,7 @@ public class HttpHeadersAssert extends AbstractMapAssert<HttpHeadersAssert, Http
 	/**
 	 * Verify that the actual HTTP headers contain a header with the given
 	 * {@code name} and {@link String} {@code value}.
-	 * @param name the name of the cookie
+	 * @param name the name of the header
 	 * @param value the expected value of the header
 	 */
 	public HttpHeadersAssert hasValue(String name, String value) {
@@ -113,8 +113,8 @@ public class HttpHeadersAssert extends AbstractMapAssert<HttpHeadersAssert, Http
 
 	/**
 	 * Verify that the actual HTTP headers contain a header with the given
-	 * {@code name} and {@link Long} {@code value}.
-	 * @param name the name of the cookie
+	 * {@code name} and {@code long} {@code value}.
+	 * @param name the name of the header
 	 * @param value the expected value of the header
 	 */
 	public HttpHeadersAssert hasValue(String name, long value) {
@@ -128,7 +128,7 @@ public class HttpHeadersAssert extends AbstractMapAssert<HttpHeadersAssert, Http
 	/**
 	 * Verify that the actual HTTP headers contain a header with the given
 	 * {@code name} and {@link Instant} {@code value}.
-	 * @param name the name of the cookie
+	 * @param name the name of the header
 	 * @param value the expected value of the header
 	 */
 	public HttpHeadersAssert hasValue(String name, Instant value) {

From cecebd0ef19e71522a6525eb4fcb674adda9ca57 Mon Sep 17 00:00:00 2001
From: Sam Brannen <104798+sbrannen@users.noreply.github.com>
Date: Mon, 20 Jan 2025 16:48:10 +0100
Subject: [PATCH 2/2] Polish HttpHeadersAssertTests

---
 .../test/http/HttpHeadersAssertTests.java     | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/spring-test/src/test/java/org/springframework/test/http/HttpHeadersAssertTests.java b/spring-test/src/test/java/org/springframework/test/http/HttpHeadersAssertTests.java
index bbca6954d9..7f8eca4566 100644
--- a/spring-test/src/test/java/org/springframework/test/http/HttpHeadersAssertTests.java
+++ b/spring-test/src/test/java/org/springframework/test/http/HttpHeadersAssertTests.java
@@ -135,10 +135,10 @@ class HttpHeadersAssertTests {
 
 	@Test
 	void hasValueWithNonPresentHeader() {
-		HttpHeaders map = new HttpHeaders();
-		map.add("test-header", "a");
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("test-header", "a");
 		assertThatExceptionOfType(AssertionError.class)
-				.isThrownBy(() -> assertThat(map).hasValue("wrong-name", "a"))
+				.isThrownBy(() -> assertThat(headers).hasValue("wrong-name", "a"))
 				.withMessageContainingAll("HTTP headers", "test-header", "wrong-name");
 	}
 
@@ -151,19 +151,19 @@ class HttpHeadersAssertTests {
 
 	@Test
 	void hasValueWithLongMatchOnSecondaryValue() {
-		HttpHeaders map = new HttpHeaders();
-		map.addAll("header", List.of("123", "456", "789"));
+		HttpHeaders headers = new HttpHeaders();
+		headers.addAll("header", List.of("123", "456", "789"));
 		assertThatExceptionOfType(AssertionError.class)
-				.isThrownBy(() -> assertThat(map).hasValue("header", 456))
+				.isThrownBy(() -> assertThat(headers).hasValue("header", 456))
 				.withMessageContainingAll("check primary long value for HTTP header 'header'", "123", "456");
 	}
 
 	@Test
 	void hasValueWithNoLongMatch() {
-		HttpHeaders map = new HttpHeaders();
-		map.addAll("header", List.of("123", "456", "789"));
+		HttpHeaders headers = new HttpHeaders();
+		headers.addAll("header", List.of("123", "456", "789"));
 		assertThatExceptionOfType(AssertionError.class)
-				.isThrownBy(() -> assertThat(map).hasValue("wrong-name", 456))
+				.isThrownBy(() -> assertThat(headers).hasValue("wrong-name", 456))
 				.withMessageContainingAll("HTTP headers", "header", "wrong-name");
 	}
 
@@ -178,20 +178,20 @@ class HttpHeadersAssertTests {
 	@Test
 	void hasValueWithNoInstantMatch() {
 		Instant instant = Instant.now();
-		HttpHeaders map = new HttpHeaders();
-		map.setInstant("header", instant);
+		HttpHeaders headers = new HttpHeaders();
+		headers.setInstant("header", instant);
 		assertThatExceptionOfType(AssertionError.class)
-				.isThrownBy(() -> assertThat(map).hasValue("wrong-name", instant.minusSeconds(30)))
+				.isThrownBy(() -> assertThat(headers).hasValue("wrong-name", instant.minusSeconds(30)))
 				.withMessageContainingAll("HTTP headers", "header", "wrong-name");
 	}
 
 	@Test
 	void hasValueWithNoInstantMatchOneSecOfDifference() {
 		Instant instant = Instant.now();
-		HttpHeaders map = new HttpHeaders();
-		map.setInstant("header", instant);
+		HttpHeaders headers = new HttpHeaders();
+		headers.setInstant("header", instant);
 		assertThatExceptionOfType(AssertionError.class)
-				.isThrownBy(() -> assertThat(map).hasValue("wrong-name", instant.minusSeconds(1)))
+				.isThrownBy(() -> assertThat(headers).hasValue("wrong-name", instant.minusSeconds(1)))
 				.withMessageContainingAll("HTTP headers", "header", "wrong-name");
 	}