summaryrefslogtreecommitdiffstats
path: root/searchcore/src/tests/grouping
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2017-03-27 16:09:16 +0200
committerHenning Baldersheim <balder@yahoo-inc.com>2017-03-27 16:21:02 +0200
commited460cb2b000e343bf828fc8b30cc45059c922ef (patch)
tree7a281585667f9f4fabc1757fe88558a2e356d959 /searchcore/src/tests/grouping
parent90e312a5b60158871ddde4fef860dd1c9750b198 (diff)
Not ready for LinkedPtr removal yet....
Diffstat (limited to 'searchcore/src/tests/grouping')
-rw-r--r--searchcore/src/tests/grouping/grouping.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/searchcore/src/tests/grouping/grouping.cpp b/searchcore/src/tests/grouping/grouping.cpp
index 0b0b9b17f90..bf1622cd84c 100644
--- a/searchcore/src/tests/grouping/grouping.cpp
+++ b/searchcore/src/tests/grouping/grouping.cpp
@@ -140,12 +140,12 @@ public:
CheckAttributeReferences() : _numrefs(0) { }
int _numrefs;
private:
- virtual void execute(vespalib::Identifiable &obj) {
+ void execute(vespalib::Identifiable &obj) override {
if (static_cast<AttributeNode &>(obj).getAttribute() != NULL) {
_numrefs++;
}
}
- virtual bool check(const vespalib::Identifiable &obj) const { return obj.inherits(AttributeNode::classId); }
+ bool check(const vespalib::Identifiable &obj) const override { return obj.inherits(AttributeNode::classId); }
};
struct DoomFixture {
@@ -305,9 +305,9 @@ TEST_F("testGroupingSession", DoomFixture()) {
CheckAttributeReferences attrCheck;
request1.select(attrCheck, attrCheck);
- EXPECT_EQUAL(attrCheck._numrefs, 0);
+ EXPECT_EQUAL(0u, attrCheck._numrefs);
request2.select(attrCheck, attrCheck);
- EXPECT_EQUAL(attrCheck._numrefs, 0);
+ EXPECT_EQUAL(0u, attrCheck._numrefs);
GroupingContext::GroupingPtr r1(new Grouping(request1));
GroupingContext::GroupingPtr r2(new Grouping(request2));
@@ -320,10 +320,11 @@ TEST_F("testGroupingSession", DoomFixture()) {
GroupingSession session(id, initContext, world.attributeContext);
CheckAttributeReferences attrCheck2;
GroupingList &gl2(initContext.getGroupingList());
+ EXPECT_EQUAL(2u, gl2.size());
for (unsigned int i = 0; i < gl2.size(); i++) {
gl2[i]->select(attrCheck2, attrCheck2);
}
- EXPECT_EQUAL(attrCheck2._numrefs, 10);
+ EXPECT_EQUAL(10u, attrCheck2._numrefs);
RankedHit hit;
hit._docId = 0;
GroupingManager &manager(session.getGroupingManager());