More field mapper test fixes

felixbarny · Nov 25, 2023 · 75acf0c · 75acf0c
1 parent 0727ce6
commit 75acf0c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/flattened/FlattenedFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/flattened/FlattenedFieldMapperTests.java
@@ -93,7 +93,6 @@ protected boolean supportsIgnoreMalformed() {
         return false;
     }
 
-    @Ignore
     @Override
     public void testMapperBuilderSizeMultiField() {}
 

diff --git a/...a/org/elasticsearch/xpack/spatial/index/mapper/GeoShapeWithDocValuesFieldMapperTests.java b/...a/org/elasticsearch/xpack/spatial/index/mapper/GeoShapeWithDocValuesFieldMapperTests.java
@@ -66,6 +66,12 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
         });
     }
 
+    @Override
+    public void testMapperBuilderSizeMultiField() throws IOException {
+        super.testMapperBuilderSizeMultiField();
+        assertWarnings("Adding multifields to [geo_shape] mappers has no effect and will be forbidden in future");
+    }
+
     protected AbstractShapeGeometryFieldType<?> fieldType(Mapper fieldMapper) {
         AbstractShapeGeometryFieldMapper<?> shapeFieldMapper = (AbstractShapeGeometryFieldMapper<?>) fieldMapper;
         return (AbstractShapeGeometryFieldType<?>) shapeFieldMapper.fieldType();

diff --git a/...ial/src/test/java/org/elasticsearch/xpack/spatial/index/mapper/PointFieldMapperTests.java b/...ial/src/test/java/org/elasticsearch/xpack/spatial/index/mapper/PointFieldMapperTests.java
@@ -63,6 +63,12 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
         });
     }
 
+    @Override
+    public void testMapperBuilderSizeMultiField() throws IOException {
+        super.testMapperBuilderSizeMultiField();
+        assertWarnings("Adding multifields to [point] mappers has no effect and will be forbidden in future");
+    }
+
     public void testAggregationsDocValuesDisabled() throws IOException {
         MapperService mapperService = createMapperService(fieldMapping(b -> {
             minimalMapping(b);

diff --git a/...ial/src/test/java/org/elasticsearch/xpack/spatial/index/mapper/ShapeFieldMapperTests.java b/...ial/src/test/java/org/elasticsearch/xpack/spatial/index/mapper/ShapeFieldMapperTests.java
@@ -87,6 +87,12 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
         });
     }
 
+    @Override
+    public void testMapperBuilderSizeMultiField() throws IOException {
+        super.testMapperBuilderSizeMultiField();
+        assertWarnings("Adding multifields to [shape] mappers has no effect and will be forbidden in future");
+    }
+
     protected AbstractShapeGeometryFieldType<?> fieldType(Mapper fieldMapper) {
         AbstractShapeGeometryFieldMapper<?> shapeFieldMapper = (AbstractShapeGeometryFieldMapper<?>) fieldMapper;
         return (AbstractShapeGeometryFieldType<?>) shapeFieldMapper.fieldType();