Moved custom config cases to another method

ivancea · ivancea · commit b088abf8f42a · 2025-10-27T13:01:31.000+01:00
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/TestCaseSupplier.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/TestCaseSupplier.java
@@ -1795,6 +1795,16 @@ public Object extra() {
             return extra;
         }
 
+        /**
+         * Build a new {@link TestCase} with the {@link #TEST_CONFIGURATION}.
+         *
+         * @deprecated Use a custom configuration instead, and test the results.
+         */
+        @Deprecated
+        public TestCase withStaticConfiguration() {
+            return withConfiguration(TEST_CONFIGURATION);
+        }
+
         /**
          * Build a new {@link TestCase} with new {@link #configuration}.
          */
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateExtractTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateExtractTests.java
@@ -56,7 +56,7 @@ public static Iterable<Object[]> parameters() {
                             "DateExtractMillisEvaluator[value=Attribute[channel=1], chronoField=Attribute[channel=0], zone=Z]",
                             DataType.LONG,
                             equalTo(2023L)
-                        ).withConfiguration(TestCaseSupplier.TEST_CONFIGURATION)
+                        ).withStaticConfiguration()
                     ),
                     new TestCaseSupplier(
                         List.of(stringType, DataType.DATE_NANOS),
@@ -68,7 +68,7 @@ public static Iterable<Object[]> parameters() {
                             "DateExtractNanosEvaluator[value=Attribute[channel=1], chronoField=Attribute[channel=0], zone=Z]",
                             DataType.LONG,
                             equalTo(2023L)
-                        ).withConfiguration(TestCaseSupplier.TEST_CONFIGURATION)
+                        ).withStaticConfiguration()
                     ),
                     new TestCaseSupplier(
                         List.of(stringType, DataType.DATE_NANOS),
@@ -80,7 +80,7 @@ public static Iterable<Object[]> parameters() {
                             "DateExtractNanosEvaluator[value=Attribute[channel=1], chronoField=Attribute[channel=0], zone=Z]",
                             DataType.LONG,
                             equalTo(123456L)
-                        ).withConfiguration(TestCaseSupplier.TEST_CONFIGURATION)
+                        ).withStaticConfiguration()
                     ),
                     new TestCaseSupplier(
                         List.of(stringType, DataType.DATETIME),
@@ -93,7 +93,7 @@ public static Iterable<Object[]> parameters() {
                             "DateExtractMillisEvaluator[value=Attribute[channel=1], chronoField=Attribute[channel=0], zone=Z]",
                             DataType.LONG,
                             is(nullValue())
-                        ).withConfiguration(TestCaseSupplier.TEST_CONFIGURATION)
+                        ).withStaticConfiguration()
                             .withWarning(
                                 "Line 1:1: evaluation of [source] failed, treating result as null. Only first 20 failures recorded."
                             )
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateFormatTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateFormatTests.java
@@ -84,7 +84,7 @@ public static Iterable<Object[]> parameters() {
             (value) -> new BytesRef(EsqlDataTypeConverter.DEFAULT_DATE_TIME_FORMATTER.formatNanos(DateUtils.toLong((Instant) value))),
             List.of()
         );
-        suppliers = TestCaseSupplier.mapTestCases(suppliers, testCase -> testCase.withConfiguration(TestCaseSupplier.TEST_CONFIGURATION));
+        suppliers = TestCaseSupplier.mapTestCases(suppliers, testCase -> testCase.withStaticConfiguration());
         return parameterSuppliersFromTypedDataWithDefaultChecks(true, suppliers);
     }
 
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/date/DayNameTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/date/DayNameTests.java
@@ -62,7 +62,7 @@ public static Iterable<Object[]> parameters() {
                     Matchers.startsWith("DayNameMillisEvaluator[val=Attribute[channel=0], zoneId=Z, locale=en_US]"),
                     DataType.KEYWORD,
                     equalTo(null)
-                ).withConfiguration(TestCaseSupplier.TEST_CONFIGURATION)
+                ).withStaticConfiguration()
             )
         );
 
@@ -78,7 +78,7 @@ private static List<TestCaseSupplier> generateTest(String dateTime, String expec
                     Matchers.startsWith("DayNameMillisEvaluator[val=Attribute[channel=0], zoneId=Z, locale=en_US]"),
                     DataType.KEYWORD,
                     equalTo(new BytesRef(expectedWeekDay))
-                ).withConfiguration(TestCaseSupplier.TEST_CONFIGURATION)
+                ).withStaticConfiguration()
             ),
             new TestCaseSupplier(
                 List.of(DataType.DATE_NANOS),
@@ -87,7 +87,7 @@ private static List<TestCaseSupplier> generateTest(String dateTime, String expec
                     Matchers.is("DayNameNanosEvaluator[val=Attribute[channel=0], zoneId=Z, locale=en_US]"),
                     DataType.KEYWORD,
                     equalTo(new BytesRef(expectedWeekDay))
-                ).withConfiguration(TestCaseSupplier.TEST_CONFIGURATION)
+                ).withStaticConfiguration()
             )
         );
     }
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/date/MonthNameTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/date/MonthNameTests.java
@@ -72,7 +72,7 @@ public static Iterable<Object[]> parameters() {
                     Matchers.startsWith("MonthNameMillisEvaluator[val=Attribute[channel=0], zoneId=Z, locale=en_US]"),
                     DataType.KEYWORD,
                     equalTo(null)
-                ).withConfiguration(TestCaseSupplier.TEST_CONFIGURATION)
+                ).withStaticConfiguration()
             )
         );
 
@@ -88,7 +88,7 @@ private static List<TestCaseSupplier> generateTest(String dateTime, String expec
                     Matchers.startsWith("MonthNameMillisEvaluator[val=Attribute[channel=0], zoneId=Z, locale=en_US]"),
                     DataType.KEYWORD,
                     equalTo(new BytesRef(expectedMonthName))
-                ).withConfiguration(TestCaseSupplier.TEST_CONFIGURATION)
+                ).withStaticConfiguration()
             ),
             new TestCaseSupplier(
                 List.of(DataType.DATE_NANOS),
@@ -97,7 +97,7 @@ private static List<TestCaseSupplier> generateTest(String dateTime, String expec
                     Matchers.is("MonthNameNanosEvaluator[val=Attribute[channel=0], zoneId=Z, locale=en_US]"),
                     DataType.KEYWORD,
                     equalTo(new BytesRef(expectedMonthName))
-                ).withConfiguration(TestCaseSupplier.TEST_CONFIGURATION)
+                ).withStaticConfiguration()
             )
         );
     }
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/date/NowTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/date/NowTests.java
@@ -42,7 +42,7 @@ public static Iterable<Object[]> parameters() {
                         matchesPattern("LiteralsEvaluator\\[lit=.*]"),
                         DataType.DATETIME,
                         equalTo(TestCaseSupplier.TEST_CONFIGURATION.now().toInstant().toEpochMilli())
-                    ).withConfiguration(TestCaseSupplier.TEST_CONFIGURATION)
+                    ).withStaticConfiguration()
                 )
             )
         );
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/ToLowerTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/ToLowerTests.java
@@ -91,9 +91,8 @@ private static void suppliers(List<TestCaseSupplier> suppliers, String name, Dat
             values.add(new TestCaseSupplier.TypedData(new BytesRef(value), type, "0"));
 
             String expectedValue = value.toLowerCase(EsqlTestUtils.TEST_CFG.locale());
-            return new TestCaseSupplier.TestCase(values, expectedToString, type, equalTo(new BytesRef(expectedValue))).withConfiguration(
-                TestCaseSupplier.TEST_CONFIGURATION
-            );
+            return new TestCaseSupplier.TestCase(values, expectedToString, type, equalTo(new BytesRef(expectedValue)))
+                .withStaticConfiguration();
         }));
         suppliers.add(new TestCaseSupplier(name + " mv", List.of(type), () -> {
             List<TestCaseSupplier.TypedData> values = new ArrayList<>();
@@ -103,9 +102,7 @@ private static void suppliers(List<TestCaseSupplier> suppliers, String name, Dat
             values.add(new TestCaseSupplier.TypedData(strings.stream().map(BytesRef::new).toList(), type, "0"));
 
             List<BytesRef> expectedValue = strings.stream().map(s -> new BytesRef(s.toLowerCase(EsqlTestUtils.TEST_CFG.locale()))).toList();
-            return new TestCaseSupplier.TestCase(values, expectedToString, type, equalTo(expectedValue)).withConfiguration(
-                TestCaseSupplier.TEST_CONFIGURATION
-            );
+            return new TestCaseSupplier.TestCase(values, expectedToString, type, equalTo(expectedValue)).withStaticConfiguration();
         }));
     }
 
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/ToUpperTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/ToUpperTests.java
@@ -91,9 +91,8 @@ private static void supplier(List<TestCaseSupplier> suppliers, String name, Data
             values.add(new TestCaseSupplier.TypedData(new BytesRef(value), type, "0"));
 
             String expectedValue = value.toUpperCase(EsqlTestUtils.TEST_CFG.locale());
-            return new TestCaseSupplier.TestCase(values, expectedToString, type, equalTo(new BytesRef(expectedValue))).withConfiguration(
-                TestCaseSupplier.TEST_CONFIGURATION
-            );
+            return new TestCaseSupplier.TestCase(values, expectedToString, type, equalTo(new BytesRef(expectedValue)))
+                .withStaticConfiguration();
         }));
         suppliers.add(new TestCaseSupplier(name + " mv", List.of(type), () -> {
             List<TestCaseSupplier.TypedData> values = new ArrayList<>();
@@ -103,9 +102,7 @@ private static void supplier(List<TestCaseSupplier> suppliers, String name, Data
             values.add(new TestCaseSupplier.TypedData(strings.stream().map(BytesRef::new).toList(), type, "0"));
 
             List<BytesRef> expectedValue = strings.stream().map(s -> new BytesRef(s.toUpperCase(EsqlTestUtils.TEST_CFG.locale()))).toList();
-            return new TestCaseSupplier.TestCase(values, expectedToString, type, equalTo(expectedValue)).withConfiguration(
-                TestCaseSupplier.TEST_CONFIGURATION
-            );
+            return new TestCaseSupplier.TestCase(values, expectedToString, type, equalTo(expectedValue)).withStaticConfiguration();
         }));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public static Iterable<Object[]> parameters() {`
`84`	`84`	`(value) -> new BytesRef(EsqlDataTypeConverter.DEFAULT_DATE_TIME_FORMATTER.formatNanos(DateUtils.toLong((Instant) value))),`
`85`	`85`	`List.of()`
`86`	`86`	`);`
`87`		`- suppliers = TestCaseSupplier.mapTestCases(suppliers, testCase -> testCase.withConfiguration(TestCaseSupplier.TEST_CONFIGURATION));`
	`87`	`+ suppliers = TestCaseSupplier.mapTestCases(suppliers, testCase -> testCase.withStaticConfiguration());`
`88`	`88`	`return parameterSuppliersFromTypedDataWithDefaultChecks(true, suppliers);`
`89`	`89`	`}`
`90`	`90`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public static Iterable<Object[]> parameters() {`
`42`	`42`	`matchesPattern("LiteralsEvaluator\\[lit=.*]"),`
`43`	`43`	`DataType.DATETIME,`
`44`	`44`	`equalTo(TestCaseSupplier.TEST_CONFIGURATION.now().toInstant().toEpochMilli())`
`45`		`- ).withConfiguration(TestCaseSupplier.TEST_CONFIGURATION)`
	`45`	`+ ).withStaticConfiguration()`
`46`	`46`	`)`
`47`	`47`	`)`
`48`	`48`	`);`