From e78d3df566a30786d586702fb91c6f2e79f91eba Mon Sep 17 00:00:00 2001
From: Sam Brannen <104798+sbrannen@users.noreply.github.com>
Date: Thu, 13 Aug 2026 17:14:45 +0200
Subject: [PATCH] Revert "Update `MockCookie#parse(String)` validation to align
 with Javadoc"

This reverts commit 8b894933aef40b8662f25ae60ea56cb136e22895 due to
code freeze on main.

See gh-37134
---
 .../java/org/springframework/mock/web/MockCookie.java  |  2 +-
 .../org/springframework/mock/web/MockCookieTests.java  | 10 +---------
 .../web/testfixture/servlet/MockCookie.java            |  2 +-
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockCookie.java b/spring-test/src/main/java/org/springframework/mock/web/MockCookie.java
index e9c50bb3d9f..b0dab61bf8e 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockCookie.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockCookie.java
@@ -132,7 +132,7 @@ public class MockCookie extends Cookie {
 	 * @return the created cookie
 	 */
 	public static MockCookie parse(String setCookieHeader) {
-		Assert.hasText(setCookieHeader, "Set-Cookie header must not be null or empty");
+		Assert.notNull(setCookieHeader, "Set-Cookie header must not be null");
 		String[] cookieParts = setCookieHeader.split("\\s*=\\s*", 2);
 		Assert.isTrue(cookieParts.length == 2, () -> "Invalid Set-Cookie header '" + setCookieHeader + "'");
 
diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockCookieTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockCookieTests.java
index 749f12192e6..461942b75e6 100644
--- a/spring-test/src/test/java/org/springframework/mock/web/MockCookieTests.java
+++ b/spring-test/src/test/java/org/springframework/mock/web/MockCookieTests.java
@@ -118,15 +118,7 @@ class MockCookieTests {
 	void parseNullHeader() {
 		assertThatIllegalArgumentException()
 			.isThrownBy(() -> MockCookie.parse(null))
-			.withMessageContaining("Set-Cookie header must not be null or empty");
-	}
-
-	@ParameterizedTest
-	@ValueSource(strings = {"", "  "})
-	void parseEmptyHeader(String header) {
-		assertThatIllegalArgumentException()
-			.isThrownBy(() -> MockCookie.parse(header))
-			.withMessageContaining("Set-Cookie header must not be null or empty");
+			.withMessageContaining("Set-Cookie header must not be null");
 	}
 
 	@Test
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockCookie.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockCookie.java
index 43c7ed8055b..d33e9ff11a9 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockCookie.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockCookie.java
@@ -132,7 +132,7 @@ public class MockCookie extends Cookie {
 	 * @return the created cookie
 	 */
 	public static MockCookie parse(String setCookieHeader) {
-		Assert.hasText(setCookieHeader, "Set-Cookie header must not be null or empty");
+		Assert.notNull(setCookieHeader, "Set-Cookie header must not be null");
 		String[] cookieParts = setCookieHeader.split("\\s*=\\s*", 2);
 		Assert.isTrue(cookieParts.length == 2, () -> "Invalid Set-Cookie header '" + setCookieHeader + "'");