Moved matchers to a common place

Author: ivancea

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/date/matchers/DateMillisMatcher.java renamed to x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/common/matchers/DateMillisMatcher.java

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-package org.elasticsearch.xpack.esql.expression.function.scalar.date.matchers;
+package org.elasticsearch.xpack.esql.common.matchers;
 
 import org.hamcrest.BaseMatcher;
 

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/date/matchers/DateNanosMatcher.java renamed to x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/common/matchers/DateNanosMatcher.java

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-package org.elasticsearch.xpack.esql.expression.function.scalar.date.matchers;
+package org.elasticsearch.xpack.esql.common.matchers;
 
 import org.elasticsearch.common.time.DateUtils;
 import org.hamcrest.BaseMatcher;

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

@@ -15,14 +15,14 @@
 import org.elasticsearch.common.time.DateUtils;
 import org.elasticsearch.index.mapper.DateFieldMapper;
 import org.elasticsearch.logging.LogManager;
+import org.elasticsearch.xpack.esql.common.matchers.DateMillisMatcher;
+import org.elasticsearch.xpack.esql.common.matchers.DateNanosMatcher;
 import org.elasticsearch.xpack.esql.core.expression.Expression;
 import org.elasticsearch.xpack.esql.core.tree.Source;
 import org.elasticsearch.xpack.esql.core.type.DataType;
 import org.elasticsearch.xpack.esql.expression.function.EsqlFunctionRegistry;
 import org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier;
 import org.elasticsearch.xpack.esql.expression.function.scalar.AbstractConfigurationFunctionTestCase;
-import org.elasticsearch.xpack.esql.expression.function.scalar.date.matchers.DateMillisMatcher;
-import org.elasticsearch.xpack.esql.expression.function.scalar.date.matchers.DateNanosMatcher;
 import org.elasticsearch.xpack.esql.session.Configuration;
 import org.hamcrest.Matcher;
 import org.hamcrest.Matchers;

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

@@ -14,14 +14,14 @@
 import org.elasticsearch.common.time.DateUtils;
 import org.elasticsearch.index.mapper.DateFieldMapper;
 import org.elasticsearch.logging.LogManager;
+import org.elasticsearch.xpack.esql.common.matchers.DateMillisMatcher;
+import org.elasticsearch.xpack.esql.common.matchers.DateNanosMatcher;
 import org.elasticsearch.xpack.esql.core.expression.Expression;
 import org.elasticsearch.xpack.esql.core.tree.Source;
 import org.elasticsearch.xpack.esql.core.type.DataType;
 import org.elasticsearch.xpack.esql.expression.function.DocsV3Support;
 import org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier;
 import org.elasticsearch.xpack.esql.expression.function.scalar.AbstractConfigurationFunctionTestCase;
-import org.elasticsearch.xpack.esql.expression.function.scalar.date.matchers.DateMillisMatcher;
-import org.elasticsearch.xpack.esql.expression.function.scalar.date.matchers.DateNanosMatcher;
 import org.elasticsearch.xpack.esql.session.Configuration;
 import org.hamcrest.Matcher;
 import org.hamcrest.Matchers;

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

@@ -12,15 +12,14 @@
 
 import org.elasticsearch.common.time.DateUtils;
 import org.elasticsearch.core.Nullable;
+import org.elasticsearch.xpack.esql.common.matchers.DateMillisMatcher;
+import org.elasticsearch.xpack.esql.common.matchers.DateNanosMatcher;
 import org.elasticsearch.xpack.esql.core.expression.Expression;
 import org.elasticsearch.xpack.esql.core.tree.Source;
 import org.elasticsearch.xpack.esql.core.type.DataType;
 import org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier;
 import org.elasticsearch.xpack.esql.expression.function.scalar.AbstractConfigurationFunctionTestCase;
-import org.elasticsearch.xpack.esql.expression.function.scalar.date.matchers.DateMillisMatcher;
-import org.elasticsearch.xpack.esql.expression.function.scalar.date.matchers.DateNanosMatcher;
 import org.elasticsearch.xpack.esql.session.Configuration;
-import org.hamcrest.BaseMatcher;
 import org.hamcrest.Matchers;
 
 import java.time.Duration;
@@ -32,7 +31,6 @@
 import java.util.function.Supplier;
 
 import static org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier.TEST_SOURCE;
-import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.DEFAULT_DATE_TIME_FORMATTER;
 import static org.hamcrest.Matchers.equalTo;
 
 /**
@@ -99,12 +97,12 @@ public static List<DurationTestCaseData> makeTruncDurationTestCases() {
             new DurationTestCaseData(Duration.ofMinutes(3 * 60), "2020-01-01T05:30:00Z", "+01:00", "2020-01-01T05:00:00Z"),
 
             // TODO: What to do with hours/minutes/seconds that are not divisors of a full day?
-            //new DurationTestCaseData(Duration.ofHours(5), "2020-01-01T05:30:00Z", "+01", "2020-01-01T05:00:00Z"),
+            // new DurationTestCaseData(Duration.ofHours(5), "2020-01-01T05:30:00Z", "+01", "2020-01-01T05:00:00Z"),
 
             ///
             /// Daylight savings
             ///
-            //- +1 -> +2 at 2025-03-30T02:00:00+01:00
+            // - +1 -> +2 at 2025-03-30T02:00:00+01:00
             new DurationTestCaseData(Duration.ofHours(3), "2025-03-30T00:00:00+01:00", "Europe/Paris", "2025-03-30T00:00:00+01:00"),
             new DurationTestCaseData(Duration.ofHours(3), "2025-03-30T01:00:00+01:00", "Europe/Paris", "2025-03-30T00:00:00+01:00"),
             new DurationTestCaseData(Duration.ofHours(3), "2025-03-30T03:00:00+02:00", "Europe/Paris", "2025-03-30T03:00:00+02:00"),
@@ -127,7 +125,7 @@ public static List<DurationTestCaseData> makeTruncDurationTestCases() {
             new DurationTestCaseData(Duration.ofMinutes(1), "2025-10-26T02:09:09+01:15", "+01:15", "2025-10-26T02:09:00+01:15"),
             new DurationTestCaseData(Duration.ofMinutes(30), "2025-10-26T02:09:09+01:15", "+01:15", "2025-10-26T02:00:00+01:15"),
             new DurationTestCaseData(Duration.ofHours(1), "2025-10-26T02:09:09+01:15", "+01:15", "2025-10-26T02:00:00+01:15"),
-        new DurationTestCaseData(Duration.ofHours(3), "2025-10-26T02:09:09+01:15", "+01:15", "2025-10-26T00:00:00+01:15"),
+            new DurationTestCaseData(Duration.ofHours(3), "2025-10-26T02:09:09+01:15", "+01:15", "2025-10-26T00:00:00+01:15"),
             new DurationTestCaseData(Duration.ofHours(24), "2025-10-26T02:09:09+01:15", "+01:15", "2025-10-26T00:00:00+01:15")
         );
     }