Correctly set maxAge and expires in ResponseCookie

Issue: SPR-16940

spring-web/src/test/java/org/springframework/http/ResponseCookieTests.java

@@ -0,0 +1,72 @@
+/*
+ * Copyright 2002-2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.http;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+/**
+ * Unit tests for {@link ResponseCookie}.
+ * @author Rossen Stoyanchev
+ */
+public class ResponseCookieTests {
+
+	@Test
+	public void defaultValues() {
+		assertEquals("id=1fWa", ResponseCookie.from("id", "1fWa").build().toString());
+	}
+
+	@Test
+	public void httpOnlyStrictSecureWithDomainAndPath() {
+		assertEquals("id=1fWa; Path=/projects; Domain=spring.io; Secure; HttpOnly; SameSite=strict",
+				ResponseCookie.from("id", "1fWa").domain("spring.io").path("/projects")
+						.httpOnly(true).secure(true).sameSite("strict").build().toString());
+	}
+
+	@Test
+	public void maxAge() {
+
+		Duration maxAge = Duration.ofDays(365);
+		String expires = HttpHeaders.formatDate(System.currentTimeMillis() + maxAge.toMillis());
+		expires = expires.substring(0, expires.indexOf(":") + 1);
+
+		assertThat(ResponseCookie.from("id", "1fWa").maxAge(maxAge).build().toString(), allOf(
+				startsWith("id=1fWa; Max-Age=31536000; Expires=" + expires),
+				endsWith(" GMT")));
+
+		assertThat(ResponseCookie.from("id", "1fWa").maxAge(maxAge.getSeconds()).build().toString(), allOf(
+				startsWith("id=1fWa; Max-Age=31536000; Expires=" + expires),
+				endsWith(" GMT")));
+	}
+
+	@Test
+	public void maxAge0() {
+		assertEquals("id=1fWa; Max-Age=0; Expires=Thu, 1 Jan 1970 00:00:00 GMT",
+				ResponseCookie.from("id", "1fWa").maxAge(Duration.ofSeconds(0)).build().toString());
+
+		assertEquals("id=1fWa; Max-Age=0; Expires=Thu, 1 Jan 1970 00:00:00 GMT",
+				ResponseCookie.from("id", "1fWa").maxAge(0).build().toString());
+	}
+
+}

spring-web/src/test/java/org/springframework/web/server/session/CookieWebSessionIdResolverTests.java

@@ -35,7 +35,7 @@ public class CookieWebSessionIdResolverTests {
 
 
 	@Test
-	public void setSessionId() throws Exception {
+	public void setSessionId() {
 		MockServerHttpRequest request = MockServerHttpRequest.get("https://example.org/path").build();
 		MockServerWebExchange exchange = MockServerWebExchange.from(request);
 		this.resolver.setSessionId(exchange, "123");