From 77205ca165b504cf61fe0619285364bb620f79d0 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Tue, 2 Oct 2018 13:06:16 +0200
Subject: [PATCH] Polish MockCookie contribution

Issue: SPR-17321, #1974
---
 .../springframework/mock/web/MockCookie.java  |  2 +-
 .../mock/web/MockCookieTests.java             | 57 +++++++++----------
 2 files changed, 28 insertions(+), 31 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 b70b3ea606..3e603040f2 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
@@ -75,7 +75,7 @@ public class MockCookie extends Cookie {
 	 */
 	public static MockCookie parse(String setCookieHeader) {
 		String[] cookieParts = setCookieHeader.split("\\s*=\\s*", 2);
-		Assert.isTrue(cookieParts.length == 2, () -> "Invalid Set-Cookie header value '" + setCookieHeader + "'");
+		Assert.isTrue(cookieParts.length == 2, () -> "Invalid Set-Cookie header '" + setCookieHeader + "'");
 
 		String name = cookieParts[0];
 		String[] valueAndAttributes = cookieParts[1].split("\\s*;\\s*", 2);
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 a41fed503f..2902c1b14e 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
@@ -30,16 +30,21 @@ import static org.junit.Assert.*;
  * @since 5.1
  */
 public class MockCookieTests {
-	
+
 	@Rule
-	public ExpectedException exception = ExpectedException.none();
+	public final ExpectedException exception = ExpectedException.none();
 
 	@Test
 	public void constructCookie() {
 		MockCookie cookie = new MockCookie("SESSION", "123");
 
-		assertEquals("SESSION", cookie.getName());
-		assertEquals("123", cookie.getValue());
+		assertCookie(cookie, "SESSION", "123");
+		assertNull(cookie.getDomain());
+		assertEquals(-1, cookie.getMaxAge());
+		assertNull(cookie.getPath());
+		assertFalse(cookie.isHttpOnly());
+		assertFalse(cookie.getSecure());
+		assertNull(cookie.getSameSite());
 	}
 
 	@Test
@@ -51,12 +56,22 @@ public class MockCookieTests {
 	}
 
 	@Test
-	public void parseValidHeader() {
+	public void parseHeaderWithoutAttributes() {
+		MockCookie cookie;
+
+		cookie = MockCookie.parse("SESSION=123");
+		assertCookie(cookie, "SESSION", "123");
+
+		cookie = MockCookie.parse("SESSION=123;");
+		assertCookie(cookie, "SESSION", "123");
+	}
+
+	@Test
+	public void parseHeaderWithAttributes() {
 		MockCookie cookie = MockCookie.parse(
 				"SESSION=123; Domain=example.com; Max-Age=60; Path=/; Secure; HttpOnly; SameSite=Lax");
 
-		assertEquals("SESSION", cookie.getName());
-		assertEquals("123", cookie.getValue());
+		assertCookie(cookie, "SESSION", "123");
 		assertEquals("example.com", cookie.getDomain());
 		assertEquals(60, cookie.getMaxAge());
 		assertEquals("/", cookie.getPath());
@@ -68,40 +83,22 @@ public class MockCookieTests {
 	@Test
 	public void parseInvalidHeader() {
 		exception.expect(IllegalArgumentException.class);
-		exception.expectMessage("Invalid Set-Cookie header value 'BOOM'");
+		exception.expectMessage("Invalid Set-Cookie header 'BOOM'");
 		MockCookie.parse("BOOM");
 	}
 
 	@Test
 	public void parseInvalidAttribute() {
-		String header = "foo=bar; Path=";
+		String header = "SESSION=123; Path=";
 
 		exception.expect(IllegalArgumentException.class);
 		exception.expectMessage("No value in attribute 'Path' for Set-Cookie header '" + header + "'");
 		MockCookie.parse(header);
 	}
 
-	@Test
-	public void testCookieParsing() {
-		MockCookie m = MockCookie.parse("foo=bar");
-		testCookie("foo", "bar", m);
-		m = MockCookie.parse("foo=bar;");
-		assertFalse(m.isHttpOnly());
-		assertFalse(m.getSecure());
-		testCookie("foo", "bar", m);
-		m = MockCookie.parse("foo=bar; HttpOnly");
-		testCookie("foo", "bar", m);
-		assertTrue(m.isHttpOnly());
-		assertFalse(m.getSecure());
-		m = MockCookie.parse("foo=bar; Secure");
-		testCookie("foo", "bar", m);
-		assertTrue(m.getSecure());
-		assertFalse(m.isHttpOnly());
-	}
-
-	private void testCookie(String name, String value, MockCookie mockCookie) {
-		assertEquals(name, mockCookie.getName());
-		assertEquals(value, mockCookie.getValue());
+	private void assertCookie(MockCookie cookie, String name, String value) {
+		assertEquals(name, cookie.getName());
+		assertEquals(value, cookie.getValue());
 	}
 
 }