Skip to content

Update MockCookie#parse(String) validation #37134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbrannen merged 2 commits into from
Aug 13, 2026
+11 −3
Merged

Update MockCookie#parse(String) validation #37134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f998f1f
Update `MockCookie#parse(String)` validation
ngocnhan-tran1996 Aug 13, 2026
438486a
Apply `@ParameterizedTest` for `MockCookieTests#parseEmptyHeader`
ngocnhan-tran1996 Aug 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion spring-test/src/main/java/org/springframework/mock/web/MockCookie.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public boolean isPartitioned() {
* @return the created cookie
*/
public static MockCookie parse(String setCookieHeader) {
Assert.notNull(setCookieHeader, "Set-Cookie header must not be null");
Assert.hasText(setCookieHeader, "Set-Cookie header must not be null or empty");
String[] cookieParts = setCookieHeader.split("\\s*=\\s*", 2);
Assert.isTrue(cookieParts.length == 2, () -> "Invalid Set-Cookie header '" + setCookieHeader + "'");

Expand Down
10 changes: 9 additions & 1 deletion spring-test/src/test/java/org/springframework/mock/web/MockCookieTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,15 @@ private void assertCookie(MockCookie cookie, String name, String value) {
void parseNullHeader() {
assertThatIllegalArgumentException()
.isThrownBy(() -> MockCookie.parse(null))
.withMessageContaining("Set-Cookie header must not be 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");
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockCookie.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public boolean isPartitioned() {
* @return the created cookie
*/
public static MockCookie parse(String setCookieHeader) {
Assert.notNull(setCookieHeader, "Set-Cookie header must not be null");
Assert.hasText(setCookieHeader, "Set-Cookie header must not be null or empty");
String[] cookieParts = setCookieHeader.split("\\s*=\\s*", 2);
Assert.isTrue(cookieParts.length == 2, () -> "Invalid Set-Cookie header '" + setCookieHeader + "'");

Expand Down