Fixup test

Author: nik9000

server/src/test/java/org/elasticsearch/index/mapper/blockloader/docvalues/AbstractFromOrdsBlockLoaderTests.java

@@ -56,9 +56,10 @@ public AbstractFromOrdsBlockLoaderTests(boolean blockAtATime, boolean highCardin
         this.missingValues = missingValues;
     }
 
-    protected abstract void innerTest(LeafReaderContext ctx) throws IOException;
+    protected abstract void innerTest(LeafReaderContext ctx, int mvCount) throws IOException;
 
     public void test() throws IOException {
+        int mvCount = 0;
         try (Directory dir = newDirectory(); RandomIndexWriter iw = new RandomIndexWriter(random(), dir)) {
             int docCount = 10_000;
             int cardinality = lowCardinality ? between(1, LOW_CARDINALITY) : between(LOW_CARDINALITY + 1, LOW_CARDINALITY * 2);
@@ -67,6 +68,7 @@ public void test() throws IOException {
                 doc.add(field(i % cardinality));
                 if (multiValues && i % cardinality == 0) {
                     doc.add(field((i % cardinality) + 1));
+                    mvCount++;
                 }
                 iw.addDocument(doc);
             }
@@ -76,7 +78,7 @@ public void test() throws IOException {
             iw.forceMerge(1);
             try (DirectoryReader dr = iw.getReader()) {
                 LeafReaderContext ctx = getOnlyLeafReader(dr).getContext();
-                innerTest(ctx);
+                innerTest(ctx, mvCount);
             }
         }
     }

server/src/test/java/org/elasticsearch/index/mapper/blockloader/docvalues/MvMaxBytesRefsFromOrdsBlockLoaderTests.java

@@ -33,7 +33,7 @@ public MvMaxBytesRefsFromOrdsBlockLoaderTests(
     }
 
     @Override
-    protected void innerTest(LeafReaderContext ctx) throws IOException {
+    protected void innerTest(LeafReaderContext ctx, int mvCount) throws IOException {
         var stringsLoader = new BytesRefsFromOrdsBlockLoader("field");
         var mvMaxLoader = new MvMaxBytesRefsFromOrdsBlockLoader("field");
 

server/src/test/java/org/elasticsearch/index/mapper/blockloader/docvalues/MvMinBytesRefsFromOrdsBlockLoaderTests.java

@@ -33,7 +33,7 @@ public MvMinBytesRefsFromOrdsBlockLoaderTests(
     }
 
     @Override
-    protected void innerTest(LeafReaderContext ctx) throws IOException {
+    protected void innerTest(LeafReaderContext ctx, int mvCount) throws IOException {
         var stringsLoader = new BytesRefsFromOrdsBlockLoader("field");
         var mvMinLoader = new MvMinBytesRefsFromOrdsBlockLoader("field");
 

server/src/test/java/org/elasticsearch/index/mapper/blockloader/docvalues/Utf8CodePointsFromOrdsBlockLoaderTests.java

@@ -36,16 +36,12 @@ public Utf8CodePointsFromOrdsBlockLoaderTests(
     }
 
     @Override
-    protected void innerTest(LeafReaderContext ctx) throws IOException {
+    protected void innerTest(LeafReaderContext ctx, int mvCount) throws IOException {
         List<MockWarnings.MockWarning> expectedWarnings = new ArrayList<>();
-        int docCount = 10_000;
-        int cardinality = lowCardinality ? between(1, LOW_CARDINALITY) : between(LOW_CARDINALITY + 1, LOW_CARDINALITY * 2);
-        for (int i = 0; i < docCount; i++) {
-            if (multiValues && i % cardinality == 0) {
-                expectedWarnings.add(
-                    new MockWarnings.MockWarning(IllegalArgumentException.class, "single-value function encountered multi-value")
-                );
-            }
+        for (int i = 0; i < mvCount; i++) {
+            expectedWarnings.add(
+                new MockWarnings.MockWarning(IllegalArgumentException.class, "single-value function encountered multi-value")
+            );
         }
 
         var warnings = new MockWarnings();