Fix incremental reduce randomization in base tests cases

We can and should randomly reduce down to a single result before
we passing the aggs to the final reduce. This commit changes the logic
to do that and ensures we don't trip the assertions the previous imple tripped.

Relates to #23253

Author: s1monw

core/src/test/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java

@@ -180,9 +180,9 @@ protected <A extends InternalAggregation, C extends Aggregator> A searchAndReduc
             if (aggs.isEmpty()) {
                 return null;
             } else {
-                if (aggs.size() > 2 && randomBoolean()) {
+                if (randomBoolean()) {
                     // sometimes do an incremental reduce
-                    List<InternalAggregation> internalAggregations = randomSubsetOf(randomIntBetween(2, aggs.size()-1), aggs);
+                    List<InternalAggregation> internalAggregations = randomSubsetOf(randomIntBetween(1, aggs.size()), aggs);
                     A internalAgg = (A) aggs.get(0).doReduce(internalAggregations,
                         new InternalAggregation.ReduceContext(root.context().bigArrays(), null, false));
                     aggs.removeAll(internalAggregations);

core/src/test/java/org/elasticsearch/search/aggregations/InternalAggregationTestCase.java

@@ -57,8 +57,9 @@ public final void testReduceRandom() {
             inputs.add(t);
             toReduce.add(t);
         }
-        if (randomBoolean() && toReduceSize >= 2) {
-            List<InternalAggregation> internalAggregations = randomSubsetOf(randomIntBetween(2, toReduceSize - 2), toReduce);
+        if (randomBoolean()) {
+            // we leave at least one in the list
+            List<InternalAggregation> internalAggregations = randomSubsetOf(randomIntBetween(1, toReduceSize), toReduce);
             InternalAggregation.ReduceContext context = new InternalAggregation.ReduceContext(null, null, true);
             @SuppressWarnings("unchecked")
             T reduced = (T) inputs.get(0).reduce(internalAggregations, context);

core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalExtendedStatsTests.java

@@ -30,7 +30,7 @@
 import java.util.List;
 import java.util.Map;
 
-public class InternalExtendedStatsTests  extends InternalAggregationTestCase<InternalExtendedStats> {
+public class InternalExtendedStatsTests extends InternalAggregationTestCase<InternalExtendedStats> {
     private double sigma;
 
     @Before