diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-03-27 19:04:58 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-03-27 19:04:58 +0200 |
commit | 4e731ca54f02924ae2ea9fc02449619fccffa2fd (patch) | |
tree | 41b51d094f9bc4ab0dd59e415fdac716ad6fcdcc /searchcore/src/tests/grouping | |
parent | 6bfb02a92cb23436fac2b903ca286946d8828415 (diff) |
Override and some copy constructor/operator cleanup.
Diffstat (limited to 'searchcore/src/tests/grouping')
-rw-r--r-- | searchcore/src/tests/grouping/grouping.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/searchcore/src/tests/grouping/grouping.cpp b/searchcore/src/tests/grouping/grouping.cpp index bf1622cd84c..b59f6162f50 100644 --- a/searchcore/src/tests/grouping/grouping.cpp +++ b/searchcore/src/tests/grouping/grouping.cpp @@ -10,6 +10,7 @@ #include <vespa/searchcore/grouping/groupingmanager.h> #include <vespa/searchcore/grouping/groupingsession.h> #include <vespa/searchcore/proton/matching/sessionmanager.h> +#include <iostream> using namespace search::attribute; using namespace search::aggregation; @@ -137,11 +138,15 @@ SessionId createSessionId(const std::string & s) { class CheckAttributeReferences : public vespalib::ObjectOperation, public vespalib::ObjectPredicate { public: - CheckAttributeReferences() : _numrefs(0) { } + CheckAttributeReferences(bool log=false) : _log(log), _numrefs(0) { } + bool _log; int _numrefs; private: void execute(vespalib::Identifiable &obj) override { - if (static_cast<AttributeNode &>(obj).getAttribute() != NULL) { + if (_log) { + std::cerr << _numrefs << ": " << &obj << " = " << obj.asString() << std::endl; + } + if (static_cast<AttributeNode &>(obj).getAttribute() != nullptr) { _numrefs++; } } @@ -319,10 +324,9 @@ TEST_F("testGroupingSession", DoomFixture()) { // Test initialization phase 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(2u, initContext.getGroupingList().size()); + for (const auto & g : initContext.getGroupingList()) { + g->select(attrCheck2, attrCheck2); } EXPECT_EQUAL(10u, attrCheck2._numrefs); RankedHit hit; |