Adding a reference date to NaturalDateParserTests (#22503)

* adding a reference date to all tests to guard against time weirdness on CI

* Using fixed clock in NaturalDateParser

---------

Co-authored-by: Tomas Dvorak <[email protected]>

Author: janheise

graylog2-server/src/main/java/org/graylog2/plugin/utilities/date/NaturalDateParser.java

@@ -23,6 +23,8 @@
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 
+import java.time.Clock;
+import java.time.Instant;
 import java.time.ZoneId;
 import java.time.temporal.WeekFields;
 import java.util.Arrays;
@@ -38,20 +40,21 @@ public class NaturalDateParser {
     private final ZoneId zoneId;
     private final DateTimeZone dateTimeZone;
     private final Locale locale;
+    private final Clock clock;
 
     public NaturalDateParser() {
-        this("Etc/UTC", Locale.getDefault());
+        this("Etc/UTC", Locale.getDefault(), Clock.systemDefaultZone());
     }
 
     public NaturalDateParser(final Locale locale) {
-        this("Etc/UTC", locale);
+        this("Etc/UTC", locale, Clock.systemDefaultZone());
     }
 
     public NaturalDateParser(final String timeZone) throws IllegalArgumentException {
-        this(timeZone, Locale.getDefault());
+        this(timeZone, Locale.getDefault(), Clock.systemDefaultZone());
     }
 
-    public NaturalDateParser(final String timeZone, final Locale locale) throws IllegalArgumentException {
+    public NaturalDateParser(final String timeZone, final Locale locale, Clock clock) throws IllegalArgumentException {
         if (!isValidTimeZone(timeZone)) {
             throw new IllegalArgumentException("Invalid timeZone: " + timeZone);
         }
@@ -60,6 +63,7 @@ public NaturalDateParser(final String timeZone, final Locale locale) throws Ille
         this.timeZone = TimeZone.getTimeZone(timeZone);
         this.zoneId = ZoneId.of(timeZone);
         this.dateTimeZone = DateTimeZone.forTimeZone(this.timeZone);
+        this.clock = clock;
     }
 
     boolean isValidTimeZone(final String timeZone) {
@@ -127,7 +131,9 @@ Date alignToEndOfDay(Date dateToConvert) {
     }
 
     public Result parse(final String string) throws DateNotParsableException {
-        return this.parse(string, new Date());
+        Instant instant = clock.instant();       // Get the current instant from the clock
+        Date date = Date.from(instant);
+        return this.parse(string, date);
     }
 
     Result parse(final String string, final Date referenceDate) throws DateNotParsableException {

graylog2-server/src/test/java/org/graylog2/plugin/utilities/date/NaturalDateParserTest.java

@@ -24,8 +24,11 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+import java.time.Clock;
+import java.time.Instant;
 import java.util.Locale;
 
+import static java.time.ZoneOffset.UTC;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.jodatime.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -51,6 +54,10 @@
  *
  */
 public class NaturalDateParserTest {
+
+    private static final Instant fixedInstant = Instant.parse("2025-05-05T09:45:23Z");
+    private static final Clock fixedClock = Clock.fixed(fixedInstant, UTC);
+
     private NaturalDateParser naturalDateParser;
     private NaturalDateParser naturalDateParserAntarctica;
     private NaturalDateParser naturalDateParserUtc;
@@ -75,9 +82,9 @@ public class NaturalDateParserTest {
 
     @BeforeEach
     public void setUp() {
-        naturalDateParser = new NaturalDateParser();
-        naturalDateParserUtc = new NaturalDateParser("Etc/UTC");
-        naturalDateParserAntarctica = new NaturalDateParser("Antarctica/Palmer");
+        naturalDateParser = new NaturalDateParser("Etc/UTC", Locale.getDefault(), fixedClock);
+        naturalDateParserUtc = new NaturalDateParser("Etc/UTC", Locale.getDefault(), fixedClock);
+        naturalDateParserAntarctica = new NaturalDateParser("Antarctica/Palmer", Locale.getDefault(), fixedClock);
     }
 
     @Test