fix tests

Author: original-brownbear

server/src/main/java/org/elasticsearch/search/aggregations/bucket/SingleBucketAggregation.java

@@ -34,7 +34,7 @@
 /**
  * A base class for all the single bucket aggregations.
  */
-public abstract class SingleBucketAggregation extends InternalAggregation {
+public class SingleBucketAggregation extends InternalAggregation {
 
     private final long docCount;
     private final InternalAggregations aggregations;
@@ -46,7 +46,7 @@ public abstract class SingleBucketAggregation extends InternalAggregation {
      * @param docCount      The document count in the single bucket.
      * @param aggregations  The already built sub-aggregations that are associated with the bucket.
      */
-    protected SingleBucketAggregation(String name, long docCount, InternalAggregations aggregations, Map<String, Object> metadata) {
+    public SingleBucketAggregation(String name, long docCount, InternalAggregations aggregations, Map<String, Object> metadata) {
         super(name, metadata);
         this.docCount = docCount;
         this.aggregations = aggregations;
@@ -96,7 +96,9 @@ public SingleBucketAggregation create(InternalAggregations subAggregations) {
     /**
      * Create a <b>new</b> empty sub aggregation. This must be a new instance on each call.
      */
-    protected abstract SingleBucketAggregation newAggregation(String name, long docCount, InternalAggregations subAggregations);
+    protected SingleBucketAggregation newAggregation(String name, long docCount, InternalAggregations subAggregations) {
+        return new SingleBucketAggregation(name, docCount, subAggregations, metadata);
+    }
 
     @Override
     protected AggregatorReducer getLeaderReducer(AggregationReduceContext reduceContext, int size) {
@@ -225,4 +227,9 @@ public boolean equals(Object obj) {
     public int hashCode() {
         return Objects.hash(super.hashCode(), docCount, aggregations);
     }
+
+    @Override
+    public String getWriteableName() {
+        return "SingleBucketAggregation";
+    }
 }

server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilter.java

@@ -19,7 +19,7 @@
 import java.util.Map;
 
 public class InternalFilter extends SingleBucketAggregation {
-    InternalFilter(String name, long docCount, InternalAggregations subAggregations, Map<String, Object> metadata) {
+    public InternalFilter(String name, long docCount, InternalAggregations subAggregations, Map<String, Object> metadata) {
         super(name, docCount, subAggregations, metadata);
     }
 

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/MockAggregations.java

@@ -17,6 +17,7 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -68,10 +69,7 @@ public static InternalFilters.InternalBucket mockFiltersBucket(String key, long
     }
 
     public static InternalFilter mockFilter(String name, long docCount) {
-        InternalFilter agg = mock(InternalFilter.class);
-        when(agg.getName()).thenReturn(name);
-        when(agg.getDocCount()).thenReturn(docCount);
-        return agg;
+        return new InternalFilter(name, docCount, InternalAggregations.EMPTY, Map.of());
     }
 
     public static InternalNumericMetricsAggregation.SingleValue mockSingleValue(String name, double value) {

x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/datafeed/extractor/aggregation/AggregationTestUtils.java

@@ -60,11 +60,7 @@ static InternalComposite.InternalBucket createCompositeBucket(
     }
 
     static SingleBucketAggregation createSingleBucketAgg(String name, long docCount, List<InternalAggregation> subAggregations) {
-        SingleBucketAggregation singleBucketAggregation = mock(SingleBucketAggregation.class);
-        when(singleBucketAggregation.getName()).thenReturn(name);
-        when(singleBucketAggregation.getDocCount()).thenReturn(docCount);
-        when(singleBucketAggregation.getAggregations()).thenReturn(createAggs(subAggregations));
-        return singleBucketAggregation;
+        return new SingleBucketAggregation(name, docCount, createAggs(subAggregations), Map.of());
     }
 
     static InternalHistogram.Bucket createHistogramBucket(long timestamp, long docCount) {