From ee559bb2c81131aac1acbe7fb84382268f7b8a1c Mon Sep 17 00:00:00 2001
From: Toshiaki Maki <tmaki@pivotal.io>
Date: Sat, 18 Aug 2018 01:20:59 +0900
Subject: [PATCH] Use long for expires and lastModified in HeaderAssertions

This commit changes the type of parameters so that HeaderAssertions
can assert expires and lastModified properly.

Issue: SPR-17194
---
 .../web/reactive/server/HeaderAssertions.java |  4 +--
 .../reactive/server/HeaderAssertionTests.java | 33 +++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/HeaderAssertions.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/HeaderAssertions.java
index 846cf20b905..5ea65c6d6c6 100644
--- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/HeaderAssertions.java
+++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/HeaderAssertions.java
@@ -152,14 +152,14 @@ public class HeaderAssertions {
 	/**
 	 * Expect an "Expires" header with the given value.
 	 */
-	public WebTestClient.ResponseSpec expires(int expires) {
+	public WebTestClient.ResponseSpec expires(long expires) {
 		return assertHeader("Expires", expires, getHeaders().getExpires());
 	}
 
 	/**
 	 * Expect a "Last-Modified" header with the given value.
 	 */
-	public WebTestClient.ResponseSpec lastModified(int lastModified) {
+	public WebTestClient.ResponseSpec lastModified(long lastModified) {
 		return assertHeader("Last-Modified", lastModified, getHeaders().getLastModified());
 	}
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/HeaderAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/HeaderAssertionTests.java
index b920fbbcd6b..6850eb99d5b 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/HeaderAssertionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/HeaderAssertionTests.java
@@ -17,6 +17,8 @@
 package org.springframework.test.web.reactive.server;
 
 import java.net.URI;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.Test;
@@ -207,6 +209,37 @@ public class HeaderAssertionTests {
 		}
 	}
 
+	@Test
+	public void expires() {
+		HttpHeaders headers = new HttpHeaders();
+		ZonedDateTime expires = ZonedDateTime.of(2018, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC"));
+		headers.setExpires(expires);
+		HeaderAssertions assertions = headerAssertions(headers);
+		assertions.expires(expires.toInstant().toEpochMilli());
+		try {
+			assertions.expires(expires.toInstant().toEpochMilli() + 1);
+			fail("Wrong value expected");
+		}
+		catch (AssertionError error) {
+			// Expected
+		}
+	}
+
+	@Test
+	public void lastModified() {
+		HttpHeaders headers = new HttpHeaders();
+		ZonedDateTime lastModified = ZonedDateTime.of(2018, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC"));
+		headers.setLastModified(lastModified.toInstant().toEpochMilli());
+		HeaderAssertions assertions = headerAssertions(headers);
+		assertions.lastModified(lastModified.toInstant().toEpochMilli());
+		try {
+			assertions.lastModified(lastModified.toInstant().toEpochMilli() + 1);
+			fail("Wrong value expected");
+		}
+		catch (AssertionError error) {
+			// Expected
+		}
+	}
 
 	private HeaderAssertions headerAssertions(HttpHeaders responseHeaders) {
 		MockClientHttpRequest request = new MockClientHttpRequest(HttpMethod.GET, URI.create("/"));