Add extra cases to dateCases

Author: ivancea

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/TestCaseSupplier.java

@@ -47,8 +47,10 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 import java.util.function.BinaryOperator;
+import java.util.function.Consumer;
 import java.util.function.DoubleFunction;
 import java.util.function.Function;
 import java.util.function.IntFunction;
@@ -1159,9 +1161,16 @@ public static List<TypedDataSupplier> dateCases(Instant min, Instant max) {
      */
     public static List<TypedDataSupplier> dateCases(long min, long max) {
         List<TypedDataSupplier> cases = new ArrayList<>();
-        if (min <= 0 && max >= 0) {
-            cases.add(new TypedDataSupplier("<1970-01-01T00:00:00Z>", () -> 0L, DataType.DATETIME));
-        }
+        Consumer<String> addExactCase = (value) -> {
+            long date = Instant.parse(value).toEpochMilli();
+            if (date >= min && date <= max) {
+                cases.add(new TypedDataSupplier("<" + value + ">", () -> date, DataType.DATETIME));
+            }
+        };
+
+        addExactCase.accept("1970-01-01T00:00:00Z");
+        addExactCase.accept("2025-03-30T01:00:00+01:00"); // Before Europe/Paris DST change
+        addExactCase.accept("2025-03-30T03:00:00+02:00"); // After Europe/Paris DST change
 
         // 1970-01-01T00:00:00Z - 2286-11-20T17:46:40Z
         long lower1 = Math.max(min, 0);
@@ -1186,6 +1195,8 @@ public static List<TypedDataSupplier> dateCases(long min, long max) {
             );
         }
 
+
+
         return cases;
     }
 
@@ -1218,11 +1229,17 @@ public static List<TypedDataSupplier> dateNanosCases(Instant minValue, Instant m
         Instant twentyTwoFifty = Instant.parse("2250-01-01T00:00:00Z");
 
         List<TypedDataSupplier> cases = new ArrayList<>();
-        if (minValue.isAfter(Instant.EPOCH) == false) {
-            cases.add(
-                new TypedDataSupplier("<1970-01-01T00:00:00.000000000Z>", () -> DateUtils.toLong(Instant.EPOCH), DataType.DATE_NANOS)
-            );
-        }
+        Consumer<String> addExactCase = (value) -> {
+            Instant instant = Instant.parse(value);
+            long date = DateUtils.toLong(Instant.parse(value));
+            if (minValue.isAfter(instant) == false && maxValue.isBefore(instant) == false) {
+                cases.add(new TypedDataSupplier("<" + value + ">", () -> date, DataType.DATE_NANOS));
+            }
+        };
+
+        addExactCase.accept("1970-01-01T00:00:00.000000000Z");
+        addExactCase.accept("2025-03-30T01:00:00.000000001+01:00"); // Before Europe/Paris DST change
+        addExactCase.accept("2025-03-30T03:00:00.000000002+02:00"); // After Europe/Paris DST change
 
         Instant lower = Instant.EPOCH.isBefore(minValue) ? minValue : Instant.EPOCH;
         Instant upper = twentyOneHundred.isAfter(maxValue) ? maxValue : twentyOneHundred;

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateTruncTests.java

@@ -173,7 +173,7 @@ public static List<PeriodTestCaseData> makeTruncPeriodTestCases() {
             new PeriodTestCaseData(Period.ofDays(1), "2024-03-01T00:30:00Z", "-03", "2024-02-29T03:00:00Z"),
 
             ///
-            /// Timezone with DST (-5 to -4 at 2025-03-09T02:00:00-05, and -4 to -5 at 2025-11-02T02:00:00-04)
+            /// Timezone with DST (e.g. New York: -5 to -4 at 2025-03-09T02:00:00-05, and -4 to -5 at 2025-11-02T02:00:00-04)
             ///
             new PeriodTestCaseData(Period.ofDays(1), "2025-03-09T06:00:00-04:00", "America/New_York", "2025-03-09T00:00:00-05:00"),
             new PeriodTestCaseData(Period.ofMonths(1), "2025-03-09T06:00:00-04:00", "America/New_York", "2025-03-01T00:00:00-05:00"),
@@ -182,6 +182,8 @@ public static List<PeriodTestCaseData> makeTruncPeriodTestCases() {
             new PeriodTestCaseData(Period.ofDays(1), "2025-11-02T05:00:00-05:00", "America/New_York", "2025-11-02T00:00:00-04:00"),
             new PeriodTestCaseData(Period.ofDays(7), "2025-11-02T05:00:00-05:00", "America/New_York", "2025-10-27T00:00:00-04:00"),
             new PeriodTestCaseData(Period.ofMonths(3), "2025-11-02T05:00:00-05:00", "America/New_York", "2025-10-01T00:00:00-04:00"),
+            new PeriodTestCaseData(Period.ofDays(1), "2025-10-26T02:00:00+02:00", "Europe/Rome", "2025-10-26T00:00:00+02:00"),
+            new PeriodTestCaseData(Period.ofMonths(3), "2025-11-02T05:00:00-05:00", "Europe/Rome", "2025-10-01T00:00:00-04:00"),
 
             ///
             /// Partial hours timezones