Fix MockCookie Partitioned support

See gh-31454
spring-projects · Jun 7, 2024 · e8c122c · e8c122c
1 parent 9cfd455
commit e8c122c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -104,7 +104,12 @@ public String getSameSite() {
 	 * @see <a href="https://datatracker.ietf.org/doc/html/draft-cutler-httpbis-partitioned-cookies#section-2.1">The Partitioned attribute spec</a>
 	 */
 	public void setPartitioned(boolean partitioned) {
-		setAttribute("Partitioned", "");
+		if (partitioned) {
+			setAttribute("Partitioned", "");
+		}
+		else {
+			setAttribute("Partitioned", null);
+		}
 	}
 
 	/**

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
@@ -46,6 +46,7 @@ void constructCookie() {
 		assertThat(cookie.getMaxAge()).isEqualTo(-1);
 		assertThat(cookie.getPath()).isNull();
 		assertThat(cookie.isHttpOnly()).isFalse();
+		assertThat(cookie.isPartitioned()).isFalse();
 		assertThat(cookie.getSecure()).isFalse();
 		assertThat(cookie.getSameSite()).isNull();
 	}
@@ -207,9 +208,11 @@ void setInvalidAttributeExpiresShouldThrow() {
 	@Test
 	void setPartitioned() {
 		MockCookie cookie = new MockCookie("SESSION", "123");
-		cookie.setAttribute("Partitioned", "");
-
+		assertThat(cookie.isPartitioned()).isFalse();
+		cookie.setPartitioned(true);
 		assertThat(cookie.isPartitioned()).isTrue();
+		cookie.setPartitioned(false);
+		assertThat(cookie.isPartitioned()).isFalse();
 	}
 
 }
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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -104,7 +104,12 @@ public String getSameSite() {
 	 * @see <a href="https://datatracker.ietf.org/doc/html/draft-cutler-httpbis-partitioned-cookies#section-2.1">The Partitioned attribute spec</a>
 	 */
 	public void setPartitioned(boolean partitioned) {
-		setAttribute("Partitioned", "");
+		if (partitioned) {
+			setAttribute("Partitioned", "");
+		}
+		else {
+			setAttribute("Partitioned", null);
+		}
 	}
 
 	/**
@@ -197,6 +202,7 @@ public String toString() {
 				.append("Comment", getComment())
 				.append("Secure", getSecure())
 				.append("HttpOnly", isHttpOnly())
+				.append("Partitioned", isPartitioned())
 				.append(SAME_SITE, getSameSite())
 				.append("Max-Age", getMaxAge())
 				.append(EXPIRES, getAttribute(EXPIRES))