diff options
author | Henning Baldersheim <balder@oath.com> | 2019-04-04 09:45:18 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@oath.com> | 2019-04-04 09:46:19 +0000 |
commit | f16846437325a6f5b9cd350d3a87ebad2c7c7703 (patch) | |
tree | 6b0479a9377bf8df1fd666f321c0e0ad805f5009 /searchlib/src/tests/groupingengine | |
parent | a6582e6b4e73528a4248f99e494a54b093ab503f (diff) |
Add conformance testing for 'sum' aggregator too.
Diffstat (limited to 'searchlib/src/tests/groupingengine')
-rw-r--r-- | searchlib/src/tests/groupingengine/groupingengine_test.cpp | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/searchlib/src/tests/groupingengine/groupingengine_test.cpp b/searchlib/src/tests/groupingengine/groupingengine_test.cpp index 3920667c1d6..da9b8d62305 100644 --- a/searchlib/src/tests/groupingengine/groupingengine_test.cpp +++ b/searchlib/src/tests/groupingengine/groupingengine_test.cpp @@ -615,6 +615,14 @@ createAggr(SingleResultNode::UP r, ExpressionNode::UP e) { return aggr; } +template<typename T> +ExpressionNode::UP +createNumAggr(NumericResultNode::UP r, ExpressionNode::UP e) { + std::unique_ptr<T> aggr = MU<T>(std::move(r)); + aggr->setExpression(std::move(e)); + return aggr; +} + void Test::testAggregationGroupCapping() { @@ -670,13 +678,13 @@ Test::testAggregationGroupCapping() Group expect; expect.setId(NullResultNode()) .addChild(Group().setId(Int64ResultNode(7)).setRank(RawRank(7)) - .addAggregationResult(createAggr<SumAggregationResult>(MU<Int64ResultNode>(7), MU<AttributeNode>("attr"))) + .addAggregationResult(createNumAggr<SumAggregationResult>(MU<Int64ResultNode>(7), MU<AttributeNode>("attr"))) .addOrderBy(MU<AggregationRefNode>(0), false)) .addChild(Group().setId(Int64ResultNode(8)).setRank(RawRank(8)) - .addAggregationResult(createAggr<SumAggregationResult>(MU<Int64ResultNode>(8), MU<AttributeNode>("attr"))) + .addAggregationResult(createNumAggr<SumAggregationResult>(MU<Int64ResultNode>(8), MU<AttributeNode>("attr"))) .addOrderBy(MU<AggregationRefNode>(0), false)) .addChild(Group().setId(Int64ResultNode(9)).setRank(RawRank(9)) - .addAggregationResult(createAggr<SumAggregationResult>(MU<Int64ResultNode>(9), MU<AttributeNode>("attr"))) + .addAggregationResult(createNumAggr<SumAggregationResult>(MU<Int64ResultNode>(9), MU<AttributeNode>("attr"))) .addOrderBy(MU<AggregationRefNode>(0), false)); EXPECT_TRUE(testAggregation(ctx, request, expect)); @@ -693,13 +701,13 @@ Test::testAggregationGroupCapping() Group expect; expect.setId(NullResultNode()) .addChild(Group().setId(Int64ResultNode(1)).setRank(RawRank(1)) - .addAggregationResult(createAggr<SumAggregationResult>(MU<Int64ResultNode>(1), MU<AttributeNode>("attr"))) + .addAggregationResult(createNumAggr<SumAggregationResult>(MU<Int64ResultNode>(1), MU<AttributeNode>("attr"))) .addOrderBy(MU<AggregationRefNode>(0), true)) .addChild(Group().setId(Int64ResultNode(2)).setRank(RawRank(2)) - .addAggregationResult(createAggr<SumAggregationResult>(MU<Int64ResultNode>(2), MU<AttributeNode>("attr"))) + .addAggregationResult(createNumAggr<SumAggregationResult>(MU<Int64ResultNode>(2), MU<AttributeNode>("attr"))) .addOrderBy(MU<AggregationRefNode>(0), true)) .addChild(Group().setId(Int64ResultNode(3)).setRank(RawRank(3)) - .addAggregationResult(createAggr<SumAggregationResult>(MU<Int64ResultNode>(3), MU<AttributeNode>("attr"))) + .addAggregationResult(createNumAggr<SumAggregationResult>(MU<Int64ResultNode>(3), MU<AttributeNode>("attr"))) .addOrderBy(MU<AggregationRefNode>(0), true)); EXPECT_TRUE(testAggregation(ctx, request, expect)); @@ -718,13 +726,13 @@ Test::testAggregationGroupCapping() Group expect = Group() .addChild(Group().setId(Int64ResultNode(7)).setRank(RawRank(7)) - .addAggregationResult(createAggr<SumAggregationResult>(MU<Int64ResultNode>(7), MU<AttributeNode>("attr"))) + .addAggregationResult(createNumAggr<SumAggregationResult>(MU<Int64ResultNode>(7), MU<AttributeNode>("attr"))) .addOrderBy(AddFunctionNode().appendArg(MU<AggregationRefNode>(0)).appendArg(MU<ConstantNode>(MU<Int64ResultNode>(3))).setResult(Int64ResultNode(10)), false)) .addChild(Group().setId(Int64ResultNode(8)).setRank(RawRank(8)) - .addAggregationResult(createAggr<SumAggregationResult>(MU<Int64ResultNode>(8), MU<AttributeNode>("attr"))) + .addAggregationResult(createNumAggr<SumAggregationResult>(MU<Int64ResultNode>(8), MU<AttributeNode>("attr"))) .addOrderBy(AddFunctionNode().appendArg(MU<AggregationRefNode>(0)).appendArg(MU<ConstantNode>(MU<Int64ResultNode>(3))).setResult(Int64ResultNode(11)), false)) .addChild(Group().setId(Int64ResultNode(9)).setRank(RawRank(9)) - .addAggregationResult(createAggr<SumAggregationResult>(MU<Int64ResultNode>(9), MU<AttributeNode>("attr"))) + .addAggregationResult(createNumAggr<SumAggregationResult>(MU<Int64ResultNode>(9), MU<AttributeNode>("attr"))) .addOrderBy(AddFunctionNode().appendArg(MU<AggregationRefNode>(0)).appendArg(MU<ConstantNode>(MU<Int64ResultNode>(3))).setResult(Int64ResultNode(12)), false)); EXPECT_TRUE(testAggregation(ctx, request, expect)); |