ESQL: Fix ShapeGeometryFieldMapperTests (and rename) (#122871) (#124251) (#127908)

Fixes #122661.
The issue was caused by RandomIndexWriter (randomly) reshuffling the document writing order. Since this test also ensures that the documents are read in the input order, I've opted to use a regular IndexWriter instead. I've also renamed the class to AbstractShapeGeometryFieldMapperTests since it was originally renamed due to a misunderstanding of muted tests (which caused it to be muted again! Busted 😅).

Co-authored-by: Gal Lalouche <[email protected]>

Author: craigtaverner

muted-tests.yml

@@ -332,9 +332,6 @@ tests:
   issue: https://github.com/elastic/elasticsearch/issues/119396
 - class: org.elasticsearch.xpack.security.authc.ldap.ADLdapUserSearchSessionFactoryTests
   issue: https://github.com/elastic/elasticsearch/issues/119882
-- class: org.elasticsearch.index.mapper.AbstractShapeGeometryFieldMapperTests
-  method: testCartesianBoundsBlockLoader
-  issue: https://github.com/elastic/elasticsearch/issues/119201
 - class: org.elasticsearch.xpack.security.operator.OperatorPrivilegesIT
   method: testEveryActionIsEitherOperatorOnlyOrNonOperator
   issue: https://github.com/elastic/elasticsearch/issues/119911
@@ -450,9 +447,6 @@ tests:
 - class: org.elasticsearch.oldrepos.OldRepositoryAccessIT
   method: testOldRepoAccess
   issue: https://github.com/elastic/elasticsearch/issues/120148
-- class: org.elasticsearch.index.mapper.ShapeGeometryFieldMapperTests
-  method: testCartesianBoundsBlockLoader
-  issue: https://github.com/elastic/elasticsearch/issues/125129
 - class: org.elasticsearch.xpack.ilm.history.ILMHistoryItemTests
   method: testTruncateLongError
   issue: https://github.com/elastic/elasticsearch/issues/125216

…apper/ShapeGeometryFieldMapperTests.java …stractShapeGeometryFieldMapperTests.javaserver/src/test/java/org/elasticsearch/index/mapper/ShapeGeometryFieldMapperTests.java renamed to server/src/test/java/org/elasticsearch/index/mapper/AbstractShapeGeometryFieldMapperTests.java server/src/test/java/org/elasticsearch/index/mapper/ShapeGeometryFieldMapperTests.java renamed to server/src/test/java/org/elasticsearch/index/mapper/AbstractShapeGeometryFieldMapperTests.java

@@ -12,9 +12,10 @@
 import org.apache.lucene.document.Document;
 import org.apache.lucene.geo.GeoEncodingUtils;
 import org.apache.lucene.index.DirectoryReader;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
 import org.apache.lucene.index.LeafReader;
 import org.apache.lucene.store.Directory;
-import org.apache.lucene.tests.index.RandomIndexWriter;
 import org.elasticsearch.common.geo.GeometryNormalizer;
 import org.elasticsearch.core.Strings;
 import org.elasticsearch.geo.GeometryTestUtils;
@@ -39,14 +40,14 @@
 import static org.apache.lucene.geo.GeoEncodingUtils.decodeLongitude;
 import static org.elasticsearch.common.geo.Orientation.RIGHT;
 
-public class ShapeGeometryFieldMapperTests extends ESTestCase {
+public class AbstractShapeGeometryFieldMapperTests extends ESTestCase {
     public void testCartesianBoundsBlockLoader() throws IOException {
         testBoundsBlockLoader(
             CoordinateEncoder.CARTESIAN,
             () -> ShapeTestUtils.randomGeometryWithoutCircle(0, false),
             CartesianShapeIndexer::new,
             SpatialEnvelopeVisitor::visitCartesian,
-            ShapeGeometryFieldMapperTests::makeCartesianRectangle
+            AbstractShapeGeometryFieldMapperTests::makeCartesianRectangle
         );
     }
 
@@ -58,7 +59,7 @@ public void ignoreTestGeoBoundsBlockLoader() throws IOException {
             () -> normalize(GeometryTestUtils.randomGeometryWithoutCircle(0, false)),
             field -> new GeoShapeIndexer(RIGHT, field),
             g -> SpatialEnvelopeVisitor.visitGeo(g, SpatialEnvelopeVisitor.WrapLongitude.WRAP),
-            ShapeGeometryFieldMapperTests::makeGeoRectangle
+            AbstractShapeGeometryFieldMapperTests::makeGeoRectangle
         );
     }
 
@@ -72,7 +73,7 @@ public void ignoreTestRectangleCrossingDateline() throws IOException {
             geometries,
             field -> new GeoShapeIndexer(RIGHT, field),
             g -> SpatialEnvelopeVisitor.visitGeo(g, SpatialEnvelopeVisitor.WrapLongitude.WRAP),
-            ShapeGeometryFieldMapperTests::makeGeoRectangle
+            AbstractShapeGeometryFieldMapperTests::makeGeoRectangle
         );
     }
 
@@ -100,7 +101,9 @@ private static void testBoundsBlockLoaderAux(
     ) throws IOException {
         var loader = new AbstractShapeGeometryFieldMapper.AbstractShapeGeometryFieldType.BoundsBlockLoader("field");
         try (Directory directory = newDirectory()) {
-            try (var iw = new RandomIndexWriter(random(), directory)) {
+            // Since we also test that the documents are loaded in the correct order, we need to write them in order, so we can't use
+            // RandomIndexWriter here.
+            try (var iw = new IndexWriter(directory, new IndexWriterConfig(null /* analyzer */))) {
                 for (Geometry geometry : geometries) {
                     var shape = new BinaryShapeDocValuesField("field", encoder);
                     shape.add(indexerFactory.apply("field").indexShape(geometry), geometry);