Ensure that we do not end up with a nullptr when accidentally averaging over a string field.

1 files changed, 32 insertions, 0 deletions

diff --git a/searchlib/src/tests/aggregator/perdocexpr.cpp b/searchlib/src/tests/aggregator/perdocexpr.cpp
index 66d2e48194d..c3667c36f8e 100644
--- a/searchlib/src/tests/aggregator/perdocexpr.cpp
+++ b/searchlib/src/tests/aggregator/perdocexpr.cpp
@@ -1325,6 +1325,38 @@ TEST("testAggregationResults") {
                           FloatResultNode(15.54));
 }
 
+TEST("test Average over integer") {
+    AggregationResult::Configure conf;
+    AverageAggregationResult avg;
+    avg.setExpression(createScalarInt(I4)).select(conf, conf);
+    avg.aggregate(0, 0);
+    EXPECT_EQUAL(I4, avg.getAverage().getInteger());
+}
+
+TEST("test Average over float") {
+    AggregationResult::Configure conf;
+    AverageAggregationResult avg;
+    avg.setExpression(createScalarFloat(I4)).select(conf, conf);
+    avg.aggregate(0, 0);
+    EXPECT_EQUAL(I4, avg.getAverage().getInteger());
+}
+
+TEST("test Average over numeric string") {
+    AggregationResult::Configure conf;
+    AverageAggregationResult avg;
+    avg.setExpression(createScalarString("7.8")).select(conf, conf);
+    avg.aggregate(0, 0);
+    EXPECT_EQUAL(7.8, avg.getAverage().getFloat());
+}
+
+TEST("test Average over non-numeric string") {
+    AggregationResult::Configure conf;
+    AverageAggregationResult avg;
+    avg.setExpression(createScalarString("ABC")).select(conf, conf);
+    avg.aggregate(0, 0);
+    EXPECT_EQUAL(0, avg.getAverage().getInteger());
+}
+
 TEST("testGrouping") {
     AttributeGuard attr1 = createInt64Attribute();
     ExpressionNode::UP result1(new CountAggregationResult());