Update test expectations

Author: alex-spies

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LocalLogicalPlanOptimizerTests.java

@@ -653,7 +653,7 @@ public void testReplaceUpperStringCasinqgWithInsensitiveRLike() {
         var filter = as(limit.child(), Filter.class);
         var rlike = as(filter.condition(), RLike.class);
         var field = as(rlike.field(), FieldAttribute.class);
-        assertThat(field.fieldName(), is("first_name"));
+        assertThat(field.fieldName().toString(), is("first_name"));
         assertThat(rlike.pattern().pattern(), is("VALÜ*"));
         assertThat(rlike.caseInsensitive(), is(true));
         var source = as(filter.child(), EsRelation.class);
@@ -667,7 +667,7 @@ public void testReplaceLowerStringCasingWithInsensitiveRLike() {
         var filter = as(limit.child(), Filter.class);
         var rlike = as(filter.condition(), RLike.class);
         var field = as(rlike.field(), FieldAttribute.class);
-        assertThat(field.fieldName(), is("first_name"));
+        assertThat(field.fieldName().toString(), is("first_name"));
         assertThat(rlike.pattern().pattern(), is("valü*"));
         assertThat(rlike.caseInsensitive(), is(true));
         var source = as(filter.child(), EsRelation.class);
@@ -692,7 +692,7 @@ public void testReplaceUpperStringCasingWithInsensitiveLike() {
         var filter = as(limit.child(), Filter.class);
         var wlike = as(filter.condition(), WildcardLike.class);
         var field = as(wlike.field(), FieldAttribute.class);
-        assertThat(field.fieldName(), is("first_name"));
+        assertThat(field.fieldName().toString(), is("first_name"));
         assertThat(wlike.pattern().pattern(), is("VALÜ*"));
         assertThat(wlike.caseInsensitive(), is(true));
         var source = as(filter.child(), EsRelation.class);
@@ -706,7 +706,7 @@ public void testReplaceLowerStringCasingWithInsensitiveLike() {
         var filter = as(limit.child(), Filter.class);
         var wlike = as(filter.condition(), WildcardLike.class);
         var field = as(wlike.field(), FieldAttribute.class);
-        assertThat(field.fieldName(), is("first_name"));
+        assertThat(field.fieldName().toString(), is("first_name"));
         assertThat(wlike.pattern().pattern(), is("valü*"));
         assertThat(wlike.caseInsensitive(), is(true));
         var source = as(filter.child(), EsRelation.class);

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LogicalPlanOptimizerTests.java

@@ -6341,7 +6341,7 @@ public void testReplaceStringCasingWithInsensitiveEqualsUnwrap() {
         var filter = as(limit.child(), Filter.class);
         var insensitive = as(filter.condition(), InsensitiveEquals.class);
         var field = as(insensitive.left(), FieldAttribute.class);
-        assertThat(field.fieldName(), is("first_name"));
+        assertThat(field.fieldName().toString(), is("first_name"));
         var bRef = as(insensitive.right().fold(FoldContext.small()), BytesRef.class);
         assertThat(bRef.utf8ToString(), is("VALÜ"));
         as(filter.child(), EsRelation.class);

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/PhysicalPlanOptimizerTests.java

@@ -988,12 +988,12 @@ public void testPushAndInequalitiesFilter() {
         var bq = as(source.query(), BoolQueryBuilder.class);
         assertThat(bq.must(), hasSize(2));
         var first = as(sv(bq.must().get(0), "emp_no"), RangeQueryBuilder.class);
-        assertThat(first.fieldName(), equalTo("emp_no"));
+        assertThat(first.fieldName().toString(), equalTo("emp_no"));
         assertThat(first.from(), equalTo(-1));
         assertThat(first.includeLower(), equalTo(false));
         assertThat(first.to(), nullValue());
         var second = as(sv(bq.must().get(1), "salary"), RangeQueryBuilder.class);
-        assertThat(second.fieldName(), equalTo("salary"));
+        assertThat(second.fieldName().toString(), equalTo("salary"));
         assertThat(second.from(), nullValue());
         assertThat(second.to(), equalTo(10));
         assertThat(second.includeUpper(), equalTo(false));
@@ -2442,7 +2442,7 @@ public void testPushDownEvalFilter() {
         assertThat(range2.fieldName(), is("first_name"));
         var sort = source.sorts();
         assertThat(sort.size(), is(1));
-        assertThat(sort.get(0).field().fieldName(), is("first_name"));
+        assertThat(sort.get(0).field().fieldName().toString(), is("first_name"));
     }
 
     /**
@@ -2501,7 +2501,7 @@ public void testPushDownEvalSwapFilter() {
         assertThat(exists.fieldName(), is("first_name"));
         var sort = source.sorts();
         assertThat(sort.size(), is(1));
-        assertThat(sort.get(0).field().fieldName(), is("last_name"));
+        assertThat(sort.get(0).field().fieldName().toString(), is("last_name"));
     }
 
     /**
@@ -3223,8 +3223,9 @@ public void testAggToLocalRelationOnDataNode() {
             """);
 
         var stats = new EsqlTestUtils.TestSearchStats() {
-            public boolean exists(String field) {
-                return "salary".equals(field);
+            @Override
+            public boolean exists(FieldAttribute.FieldName field) {
+                return "salary".equals(field.toString());
             }
         };
         var optimized = optimizedPlan(plan, stats);
@@ -5092,7 +5093,7 @@ public void testPushSpatialDistanceEvalToSource() {
         assertThat(alias.name(), is("distance"));
         var stDistance = as(alias.child(), StDistance.class);
         var location = as(stDistance.left(), FieldAttribute.class);
-        assertThat(location.fieldName(), is("location"));
+        assertThat(location.fieldName().toString(), is("location"));
 
         // Validate the filter condition
         var and = as(filter.condition(), And.class);
@@ -5146,7 +5147,7 @@ public void testPushSpatialDistanceMultiEvalToSource() {
         assertThat(alias2.name(), is("distance"));
         var stDistance = as(alias2.child(), StDistance.class);
         var location = as(stDistance.left(), FieldAttribute.class);
-        assertThat(location.fieldName(), is("location"));
+        assertThat(location.fieldName().toString(), is("location"));
         var poiRef = as(stDistance.right(), Literal.class);
         assertThat(poiRef.value(), instanceOf(BytesRef.class));
         assertThat(poiRef.value().toString(), is(poi.value().toString()));
@@ -6502,7 +6503,7 @@ public void testPushCompoundTopNDistanceWithCompoundFilterAndCompoundEvalToSourc
         assertThat(alias2.name(), is("distance"));
         var stDistance = as(alias2.child(), StDistance.class);
         var location = as(stDistance.left(), FieldAttribute.class);
-        assertThat(location.fieldName(), is("location"));
+        assertThat(location.fieldName().toString(), is("location"));
         var poiRef = as(stDistance.right(), Literal.class);
         assertThat(poiRef.value(), instanceOf(BytesRef.class));
         assertThat(poiRef.value().toString(), is(poi.value().toString()));
@@ -6688,7 +6689,7 @@ public void testPushCompoundTopNDistanceWithCompoundFilterAndNestedCompoundEvalT
         assertThat(alias2.name(), is("distance"));
         var stDistance = as(alias2.child(), StDistance.class);
         var location = as(stDistance.left(), FieldAttribute.class);
-        assertThat(location.fieldName(), is("location"));
+        assertThat(location.fieldName().toString(), is("location"));
         var poiRef = as(stDistance.right(), Literal.class);
         assertThat(poiRef.value(), instanceOf(BytesRef.class));
         assertThat(poiRef.value().toString(), is(poi.value().toString()));