Adding tests for .format()

jetty · Apr 23, 2024 · 2b67f05 · 2b67f05
1 parent 20660bc
commit 2b67f05
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpDateTime.java b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpDateTime.java
@@ -15,8 +15,6 @@
 
 import java.nio.charset.StandardCharsets;
 import java.time.DateTimeException;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAccessor;
@@ -30,6 +28,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static java.time.ZoneOffset.UTC;
+
 /**
  * HTTP Date/Time parsing and formatting.
  *
@@ -47,8 +47,6 @@
 public class HttpDateTime
 {
     private static final Logger LOG = LoggerFactory.getLogger(HttpDateTime.class);
-    private static final ZoneId GMT = ZoneId.of("GMT");
-    private static final ZoneId UTC = ZoneOffset.UTC;
     private static final Index<Integer> MONTH_CACHE = new Index.Builder<Integer>()
         .caseSensitive(false)
         // Note: Calendar.Month fields are zero based.
@@ -244,7 +242,7 @@ else if (token.length() == 4)
     public static String format(TemporalAccessor datetime)
     {
         return DateTimeFormatter.RFC_1123_DATE_TIME
-            .withZone(GMT)
+            .withZone(UTC)
             .format(datetime);
     }
 }
diff --git a/jetty-core/jetty-http/src/test/java/org/eclipse/jetty/http/HttpDateTimeTest.java b/jetty-core/jetty-http/src/test/java/org/eclipse/jetty/http/HttpDateTimeTest.java
@@ -13,6 +13,8 @@
 
 package org.eclipse.jetty.http;
 
+import java.time.Instant;
+import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
@@ -190,4 +192,23 @@ public void testParseToEpochBeforeEpoch()
         long epoch = HttpDateTime.parseToEpoch("Fri, 13 Mar 1964 11:22:33 GMT");
         assertThat(epoch, is(-183127047000L));
     }
+
+    @Test
+    public void testFormatZonedDateTime()
+    {
+        // When "Back to the Future" released
+        ZonedDateTime zonedDateTime = ZonedDateTime.of(1984, 7, 3, 8, 10, 30, 0, ZoneId.of("US/Pacific"));
+        String actual = HttpDateTime.format(zonedDateTime);
+        assertThat(actual, is("Tue, 3 Jul 1984 15:10:30 GMT"));
+    }
+
+    @Test
+    public void testFormatInstant()
+    {
+        // When "Tron" released
+        long epochMillis = 395054120000L;
+        Instant instant = Instant.ofEpochMilli(epochMillis);
+        String actual = HttpDateTime.format(instant);
+        assertThat(actual, is("Fri, 9 Jul 1982 09:15:20 GMT"));
+    }
 }