ESQL: Make function tests with timezone or locale use random configurations

test/framework/src/main/java/org/elasticsearch/test/ReadableMatchers.java

@@ -9,6 +9,7 @@
 
 package org.elasticsearch.test;
 
+import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.common.time.DateFormatter;
 import org.elasticsearch.common.time.DateUtils;
 import org.hamcrest.Description;
@@ -39,6 +40,13 @@ public static DateNanosMatcher matchesDateNanos(String date) {
         return new DateNanosMatcher(date);
     }
 
+    /**
+     * Test matcher for BytesRef that expects BytesRefs, but describes the errors as strings, for better readability.
+     */
+    public static StringBytesRefMatcher matchesBytesRef(String string) {
+        return new StringBytesRefMatcher(string);
+    }
+
     public static class DateMillisMatcher extends TypeSafeMatcher<Long> {
         private final long timeMillis;
 
@@ -84,4 +92,30 @@ public void describeTo(Description description) {
             description.appendText(dateFormatter.formatNanos(timeNanos));
         }
     }
+
+    public static class StringBytesRefMatcher extends TypeSafeMatcher<BytesRef> {
+        private final String string;
+        private final BytesRef bytesRef;
+
+        public StringBytesRefMatcher(String string) {
+            this.string = string;
+            this.bytesRef = new BytesRef(string);
+        }
+
+        @Override
+        protected boolean matchesSafely(BytesRef item) {
+            return item.equals(bytesRef);
+        }
+
+        @Override
+        public void describeMismatchSafely(BytesRef item, Description description) {
+            description.appendText("was ").appendValue(item.utf8ToString());
+        }
+
+        @Override
+        public void describeTo(Description description) {
+            description.appendText(string);
+        }
+    }
+
 }

x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/ConfigurationTestUtils.java

@@ -80,6 +80,10 @@ public static Configuration randomConfiguration(String query, Map<String, Map<St
         );
     }
 
+    public static ConfigurationBuilder randomConfigurationBuilder() {
+        return new ConfigurationBuilder(randomConfiguration());
+    }
+
     private static QueryPragmas randomQueryPragmas() {
         return new QueryPragmas(
             Settings.builder().put(QueryPragmas.DATA_PARTITIONING.getKey(), randomFrom(DataPartitioning.values())).build()

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

@@ -1606,7 +1606,7 @@ public static List<TestCaseSupplier> mapTestCases(
     ) {
         return suppliers.stream()
             .map(supplier -> new TestCaseSupplier(supplier.name(), supplier.types(), () -> mapper.apply(supplier.get())))
-            .toList();
+            .collect(Collectors.toCollection(ArrayList::new));
     }
 
     public static final class TestCase {
@@ -1822,19 +1822,6 @@ public Object extra() {
             return extra;
         }
 
-        /**
-         * Build a new {@link TestCase} with the {@link #TEST_CONFIGURATION}.
-         * <p>
-         *     The source is also set to match the configuration
-         * </p>
-         *
-         * @deprecated Use a custom configuration instead, and test the results.
-         */
-        @Deprecated
-        public TestCase withStaticConfiguration() {
-            return withConfiguration(TEST_SOURCE, TEST_CONFIGURATION);
-        }
-
         /**
          * Build a new {@link TestCase} with new {@link #configuration}.
          * <p>

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

@@ -30,6 +30,7 @@
 import java.time.Duration;
 import java.time.Instant;
 import java.time.Period;
+import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.LongSupplier;
@@ -124,7 +125,7 @@ private static void dateCases(List<TestCaseSupplier> suppliers, String name, Lon
                             + "rounding=Rounding[DAY_OF_MONTH in Z][fixed to midnight]]",
                         DataType.DATETIME,
                         resultsMatcher(args)
-                    ).withStaticConfiguration();
+                    ).withConfiguration(TEST_SOURCE, configurationForTimezone(ZoneOffset.UTC));
                 }));
                 // same as above, but a low bucket count and datetime bounds that match it (at hour span)
                 suppliers.add(new TestCaseSupplier(name, List.of(DataType.DATETIME, DataType.INTEGER, fromType, toType), () -> {
@@ -138,7 +139,7 @@ private static void dateCases(List<TestCaseSupplier> suppliers, String name, Lon
                         "DateTruncDatetimeEvaluator[fieldVal=Attribute[channel=0], rounding=Rounding[3600000 in Z][fixed]]",
                         DataType.DATETIME,
                         equalTo(Rounding.builder(Rounding.DateTimeUnit.HOUR_OF_DAY).build().prepareForUnknown().round(date.getAsLong()))
-                    ).withStaticConfiguration();
+                    ).withConfiguration(TEST_SOURCE, configurationForTimezone(ZoneOffset.UTC));
                 }));
             }
         }
@@ -253,7 +254,7 @@ private static void dateCasesWithSpan(
                 "DateTruncDatetimeEvaluator[fieldVal=Attribute[channel=0], rounding=Rounding" + spanStr + "]",
                 DataType.DATETIME,
                 resultsMatcher(args)
-            ).withStaticConfiguration();
+            ).withConfiguration(TEST_SOURCE, configurationForTimezone(ZoneOffset.UTC));
         }));
     }
 
@@ -274,7 +275,7 @@ private static void dateNanosCasesWithSpan(
                 Matchers.startsWith("DateTruncDateNanosEvaluator[fieldVal=Attribute[channel=0], rounding=Rounding["),
                 DataType.DATE_NANOS,
                 resultsMatcher(args)
-            ).withStaticConfiguration();
+            ).withConfiguration(TEST_SOURCE, configurationForTimezone(ZoneOffset.UTC));
         }));
     }
 
@@ -293,7 +294,7 @@ private static void dateNanosCases(List<TestCaseSupplier> suppliers, String name
                         Matchers.startsWith("DateTruncDateNanosEvaluator[fieldVal=Attribute[channel=0], rounding=Rounding["),
                         DataType.DATE_NANOS,
                         resultsMatcher(args)
-                    ).withStaticConfiguration();
+                    ).withConfiguration(TEST_SOURCE, configurationForTimezone(ZoneOffset.UTC));
                 }));
                 // same as above, but a low bucket count and datetime bounds that match it (at hour span)
                 suppliers.add(new TestCaseSupplier(name, List.of(DataType.DATE_NANOS, DataType.INTEGER, fromType, toType), () -> {
@@ -307,7 +308,7 @@ private static void dateNanosCases(List<TestCaseSupplier> suppliers, String name
                         Matchers.startsWith("DateTruncDateNanosEvaluator[fieldVal=Attribute[channel=0], rounding=Rounding["),
                         DataType.DATE_NANOS,
                         equalTo(Rounding.builder(Rounding.DateTimeUnit.HOUR_OF_DAY).build().prepareForUnknown().round(date.getAsLong()))
-                    ).withStaticConfiguration();
+                    ).withConfiguration(TEST_SOURCE, configurationForTimezone(ZoneOffset.UTC));
                 }));
             }
         }

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

@@ -29,6 +29,7 @@
 import java.time.Duration;
 import java.time.Instant;
 import java.time.Period;
+import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.LongSupplier;
@@ -105,7 +106,7 @@ private static void dateCasesWithSpan(
                 "DateTruncDatetimeEvaluator[fieldVal=Attribute[channel=0], rounding=Rounding" + spanStr + "]",
                 DataType.DATETIME,
                 resultsMatcher(args)
-            ).withStaticConfiguration();
+            ).withConfiguration(TEST_SOURCE, configurationForTimezone(ZoneOffset.UTC));
         }));
     }
 
@@ -125,7 +126,7 @@ private static void dateNanosCasesWithSpan(
                 Matchers.startsWith("DateTruncDateNanosEvaluator[fieldVal=Attribute[channel=0], rounding=Rounding["),
                 DataType.DATE_NANOS,
                 resultsMatcher(args)
-            ).withStaticConfiguration();
+            ).withConfiguration(TEST_SOURCE, configurationForTimezone(ZoneOffset.UTC));
         }));
     }
 

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

@@ -7,16 +7,17 @@
 
 package org.elasticsearch.xpack.esql.expression.function.scalar;
 
-import org.elasticsearch.xpack.esql.ConfigurationBuilder;
 import org.elasticsearch.xpack.esql.core.expression.Expression;
 import org.elasticsearch.xpack.esql.core.tree.Source;
 import org.elasticsearch.xpack.esql.expression.function.AbstractScalarFunctionTestCase;
 import org.elasticsearch.xpack.esql.session.Configuration;
 
 import java.time.ZoneId;
 import java.util.List;
+import java.util.Locale;
 
 import static org.elasticsearch.xpack.esql.ConfigurationTestUtils.randomConfiguration;
+import static org.elasticsearch.xpack.esql.ConfigurationTestUtils.randomConfigurationBuilder;
 import static org.elasticsearch.xpack.esql.ConfigurationTestUtils.randomTables;
 import static org.elasticsearch.xpack.esql.SerializationTestUtils.assertSerialization;
 import static org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier.TEST_SOURCE;
@@ -48,6 +49,14 @@ public void testSerializationWithConfiguration() {
     }
 
     protected static Configuration configurationForTimezone(ZoneId zoneId) {
-        return new ConfigurationBuilder(randomConfiguration()).query(TEST_SOURCE.text()).zoneId(zoneId).build();
+        return randomConfigurationBuilder().query(TEST_SOURCE.text()).zoneId(zoneId).build();
+    }
+
+    protected static Configuration configurationForLocale(Locale locale) {
+        return randomConfigurationBuilder().query(TEST_SOURCE.text()).locale(locale).build();
+    }
+
+    protected static Configuration configurationForTimezoneAndLocale(ZoneId zoneId, Locale locale) {
+        return randomConfigurationBuilder().query(TEST_SOURCE.text()).zoneId(zoneId).locale(locale).build();
     }
 }

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

@@ -11,6 +11,7 @@
 import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
 
 import org.apache.lucene.util.BytesRef;
+import org.elasticsearch.common.time.DateUtils;
 import org.elasticsearch.compute.operator.DriverContext;
 import org.elasticsearch.xpack.esql.EsqlTestUtils;
 import org.elasticsearch.xpack.esql.core.InvalidArgumentException;
@@ -24,12 +25,15 @@
 import org.elasticsearch.xpack.esql.session.Configuration;
 
 import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.time.temporal.ChronoField;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Supplier;
 
+import static org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier.TEST_SOURCE;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
@@ -46,30 +50,6 @@ public static Iterable<Object[]> parameters() {
         for (var stringType : DataType.stringTypes()) {
             suppliers.addAll(
                 List.of(
-                    new TestCaseSupplier(
-                        List.of(stringType, DataType.DATETIME),
-                        () -> new TestCaseSupplier.TestCase(
-                            List.of(
-                                new TestCaseSupplier.TypedData(new BytesRef("YeAr"), stringType, "chrono"),
-                                new TestCaseSupplier.TypedData(1687944333000L, DataType.DATETIME, "date")
-                            ),
-                            "DateExtractMillisEvaluator[value=Attribute[channel=1], chronoField=Attribute[channel=0], zone=Z]",
-                            DataType.LONG,
-                            equalTo(2023L)
-                        ).withStaticConfiguration()
-                    ),
-                    new TestCaseSupplier(
-                        List.of(stringType, DataType.DATE_NANOS),
-                        () -> new TestCaseSupplier.TestCase(
-                            List.of(
-                                new TestCaseSupplier.TypedData(new BytesRef("YeAr"), stringType, "chrono"),
-                                new TestCaseSupplier.TypedData(1687944333000000000L, DataType.DATE_NANOS, "date")
-                            ),
-                            "DateExtractNanosEvaluator[value=Attribute[channel=1], chronoField=Attribute[channel=0], zone=Z]",
-                            DataType.LONG,
-                            equalTo(2023L)
-                        ).withStaticConfiguration()
-                    ),
                     new TestCaseSupplier(
                         List.of(stringType, DataType.DATE_NANOS),
                         () -> new TestCaseSupplier.TestCase(
@@ -80,7 +60,7 @@ public static Iterable<Object[]> parameters() {
                             "DateExtractNanosEvaluator[value=Attribute[channel=1], chronoField=Attribute[channel=0], zone=Z]",
                             DataType.LONG,
                             equalTo(123456L)
-                        ).withStaticConfiguration()
+                        ).withConfiguration(TestCaseSupplier.TEST_SOURCE, configurationForTimezone(ZoneOffset.UTC))
                     ),
                     new TestCaseSupplier(
                         List.of(stringType, DataType.DATETIME),
@@ -93,7 +73,7 @@ public static Iterable<Object[]> parameters() {
                             "DateExtractMillisEvaluator[value=Attribute[channel=1], chronoField=Attribute[channel=0], zone=Z]",
                             DataType.LONG,
                             is(nullValue())
-                        ).withStaticConfiguration()
+                        ).withConfiguration(TestCaseSupplier.TEST_SOURCE, configurationForTimezone(ZoneOffset.UTC))
                             .withWarning(
                                 "Line 1:1: evaluation of [source] failed, treating result as null. Only first 20 failures recorded."
                             )
@@ -107,9 +87,46 @@ public static Iterable<Object[]> parameters() {
             );
         }
 
+        suppliers.addAll(casesFor("YeAr", "2023-11-04T16:13:12Z", "Z", 2023));
+        suppliers.addAll(casesFor("day_of_month", "2020-01-01T00:00:00Z", "America/New_York", 31));
+        suppliers.addAll(casesFor("month_of_year", "2020-06-30T23:00:00Z", "Europe/Paris", 7));
+
         return parameterSuppliersFromTypedDataWithDefaultChecks(true, suppliers);
     }
 
+    private static List<TestCaseSupplier> casesFor(String field, String date, String zoneIdName, long expectedResult) {
+        long dateMillis = Instant.parse(date).toEpochMilli();
+        ZoneId zoneId = ZoneId.of(zoneIdName);
+        return List.of(
+            new TestCaseSupplier(
+                field + " - " + date + " (millis) - " + zoneId,
+                List.of(DataType.KEYWORD, DataType.DATETIME),
+                () -> new TestCaseSupplier.TestCase(
+                    List.of(
+                        new TestCaseSupplier.TypedData(field, DataType.KEYWORD, "field"),
+                        new TestCaseSupplier.TypedData(dateMillis, DataType.DATETIME, "date")
+                    ),
+                    "DateExtractMillisEvaluator[value=Attribute[channel=1], chronoField=Attribute[channel=0], zone=" + zoneId + "]",
+                    DataType.LONG,
+                    equalTo(expectedResult)
+                ).withConfiguration(TEST_SOURCE, configurationForTimezone(zoneId))
+            ),
+            new TestCaseSupplier(
+                field + " - " + date + " (nanos) - " + zoneId,
+                List.of(DataType.KEYWORD, DataType.DATE_NANOS),
+                () -> new TestCaseSupplier.TestCase(
+                    List.of(
+                        new TestCaseSupplier.TypedData(field, DataType.KEYWORD, "field"),
+                        new TestCaseSupplier.TypedData(DateUtils.toNanoSeconds(dateMillis), DataType.DATE_NANOS, "date")
+                    ),
+                    "DateExtractNanosEvaluator[value=Attribute[channel=1], chronoField=Attribute[channel=0], zone=" + zoneId + "]",
+                    DataType.LONG,
+                    equalTo(expectedResult)
+                ).withConfiguration(TEST_SOURCE, configurationForTimezone(zoneId))
+            )
+        );
+    }
+
     public void testAllChronoFields() {
         long epochMilli = 1687944333123L;
         ZonedDateTime date = Instant.ofEpochMilli(epochMilli).atZone(EsqlTestUtils.TEST_CFG.zoneId());