From 2f33d55328f0a8e6972d92d3cee8f8ad7a9c45f2 Mon Sep 17 00:00:00 2001
From: Nik Everett <nik9000@gmail.com>
Date: Tue, 12 Sep 2023 13:10:15 -0400
Subject: [PATCH] test

---
 .../esql/type/EsqlDataTypeRegistryTests.java  | 41 ++++++++-----------
 1 file changed, 16 insertions(+), 25 deletions(-)

diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/type/EsqlDataTypeRegistryTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/type/EsqlDataTypeRegistryTests.java
index 38ba6057db912..63c1a4ac376cc 100644
--- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/type/EsqlDataTypeRegistryTests.java
+++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/type/EsqlDataTypeRegistryTests.java
@@ -8,7 +8,6 @@
 
 import org.elasticsearch.action.fieldcaps.FieldCapabilities;
 import org.elasticsearch.action.fieldcaps.FieldCapabilitiesResponse;
-import org.elasticsearch.common.Strings;
 import org.elasticsearch.index.mapper.TimeSeriesParams;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.xpack.ql.index.IndexResolution;
@@ -22,7 +21,7 @@
 
 public class EsqlDataTypeRegistryTests extends ESTestCase {
     public void testCounter() {
-        resolve("long", TimeSeriesParams.MetricType.COUNTER, DataTypes.UNSIGNED_LONG);
+        resolve("long", TimeSeriesParams.MetricType.COUNTER, DataTypes.UNSUPPORTED);
     }
 
     public void testGauge() {
@@ -35,33 +34,25 @@ public void testLong() {
 
     private void resolve(String esTypeName, TimeSeriesParams.MetricType metricType, DataType expected) {
         String[] indices = new String[] { "idx-" + randomAlphaOfLength(5) };
-        FieldCapabilitiesResponse caps = new FieldCapabilitiesResponse(
+        FieldCapabilities fieldCap = new FieldCapabilities(
+            randomAlphaOfLength(3),
+            esTypeName,
+            false,
+            true,
+            true,
+            false,
+            metricType,
             indices,
-            Map.of(
-                "f",
-                Map.of(
-                    esTypeName,
-                    new FieldCapabilities(
-                        "c",
-                        esTypeName,
-                        false,
-                        true,
-                        true,
-                        false,
-                        metricType,
-                        indices,
-                        Strings.EMPTY_ARRAY,
-                        Strings.EMPTY_ARRAY,
-                        Strings.EMPTY_ARRAY,
-                        Strings.EMPTY_ARRAY,
-                        Map.of()
-                    )
-                )
-            )
+            null,
+            null,
+            null,
+            null,
+            Map.of()
         );
+        FieldCapabilitiesResponse caps = new FieldCapabilitiesResponse(indices, Map.of(fieldCap.getName(), Map.of(esTypeName, fieldCap)));
         IndexResolution resolution = IndexResolver.mergedMappings(EsqlDataTypeRegistry.INSTANCE, "idx-*", caps);
 
-        EsField f = resolution.get().mapping().get("f");
+        EsField f = resolution.get().mapping().get(fieldCap.getName());
         assertThat(f.getDataType(), equalTo(expected));
     }
 }