Repository: struts Updated Branches: refs/heads/support-2-3 ff4cdd967 -> a39879317
make test passed for people not using GMT. (cherry picked from commit 32ec7a669c4c1103f7778f379d5626b52954d427) Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/a3987931 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a3987931 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a3987931 Branch: refs/heads/support-2-3 Commit: a398793177829705345e4841974b909b3ce9e728 Parents: ff4cdd9 Author: donghui <hui.d...@hpe.com> Authored: Mon Jan 4 11:23:51 2016 +0800 Committer: Aleksandr Mashchenko <amashche...@apache.org> Committed: Thu Jan 14 20:11:54 2016 +0200 ---------------------------------------------------------------------- .../apache/struts2/rest/DefaultHttpHeadersTest.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/a3987931/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java ---------------------------------------------------------------------- diff --git a/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java b/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java index f46a203..d80c33b 100644 --- a/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java +++ b/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java @@ -27,6 +27,8 @@ import org.springframework.mock.web.MockHttpServletResponse; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.Locale; +import java.util.TimeZone; import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; import static javax.servlet.http.HttpServletResponse.SC_CREATED; @@ -133,7 +135,7 @@ public class DefaultHttpHeadersTest extends TestCase { Date now = new Date(); DefaultHttpHeaders headers = new DefaultHttpHeaders() .lastModified(now); - mockRequest.addHeader("If-Modified-Since", new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz").format(now)); + mockRequest.addHeader("If-Modified-Since", getGMTDateFormat().format(now)); headers.apply(mockRequest, mockResponse, new Object()); assertEquals(SC_NOT_MODIFIED, mockResponse.getStatus()); @@ -152,7 +154,7 @@ public class DefaultHttpHeadersTest extends TestCase { public void testLastModifiedSince() { Date now = new Date(); DefaultHttpHeaders headers = new DefaultHttpHeaders().lastModified(now); - mockRequest.addHeader("If-Modified-Since", new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz").format(now)); + mockRequest.addHeader("If-Modified-Since", getGMTDateFormat().format(now)); headers.apply(mockRequest, mockResponse, new Object()); assertEquals(SC_NOT_MODIFIED, mockResponse.getStatus()); @@ -161,7 +163,7 @@ public class DefaultHttpHeadersTest extends TestCase { public void testLastModifiedSinceIsOlder() { Date now = new Date(); DefaultHttpHeaders headers = new DefaultHttpHeaders().lastModified(now); - mockRequest.addHeader("If-Modified-Since", new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz").format(new Date(now.getTime() - 1000 * 60 * 60))); + mockRequest.addHeader("If-Modified-Since", getGMTDateFormat().format(new Date(now.getTime() - 1000 * 60 * 60))); headers.apply(mockRequest, mockResponse, new Object()); assertEquals(SC_NOT_MODIFIED, mockResponse.getStatus()); @@ -173,7 +175,7 @@ public class DefaultHttpHeadersTest extends TestCase { .lastModified(now) .withETag("asdf"); mockRequest.addHeader("If-None-Match", "asdf"); - mockRequest.addHeader("If-Modified-Since", new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz").format(now)); + mockRequest.addHeader("If-Modified-Since", getGMTDateFormat().format(now)); headers.apply(mockRequest, mockResponse, new Object()); assertEquals(SC_NOT_MODIFIED, mockResponse.getStatus()); @@ -219,4 +221,10 @@ public class DefaultHttpHeadersTest extends TestCase { assertEquals(SC_OK, mockResponse.getStatus()); } + + private SimpleDateFormat getGMTDateFormat() { + SimpleDateFormat format = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US); + format.setTimeZone(TimeZone.getTimeZone("GMT")); + return format; + } }
