diff options
author | Henning Baldersheim <balder@oath.com> | 2018-08-10 11:35:45 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@oath.com> | 2018-08-10 11:35:45 +0200 |
commit | a69d3fbc52267773b93eab46a25b20cde142ce34 (patch) | |
tree | e106859b1005f455cf4ec4a0938c6e236d26368f /searchcore/src/tests/proton/matching/matching_test.cpp | |
parent | 5f121bdf1f3ed9e19091f345f98116fdfc59f56f (diff) |
get_mtf -> create_mtf
Diffstat (limited to 'searchcore/src/tests/proton/matching/matching_test.cpp')
-rw-r--r-- | searchcore/src/tests/proton/matching/matching_test.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/searchcore/src/tests/proton/matching/matching_test.cpp b/searchcore/src/tests/proton/matching/matching_test.cpp index e755032b8b8..ef60a375a5c 100644 --- a/searchcore/src/tests/proton/matching/matching_test.cpp +++ b/searchcore/src/tests/proton/matching/matching_test.cpp @@ -332,15 +332,15 @@ struct MyWorld { MySearchHandler(Matcher::SP matcher) : _matcher(matcher) {} - virtual DocsumReply::UP getDocsums(const DocsumRequest &) override - { return DocsumReply::UP(); } - virtual SearchReply::UP match(const ISearchHandler::SP &, - const SearchRequest &, - vespalib::ThreadBundle &) const override - { return SearchReply::UP(); } + DocsumReply::UP getDocsums(const DocsumRequest &) override { + return DocsumReply::UP(); + } + SearchReply::UP match(const ISearchHandler::SP &, const SearchRequest &, vespalib::ThreadBundle &) const override { + return SearchReply::UP(); + } }; - MatchToolsFactory::UP get_mtf(SearchRequest::SP req) { + MatchToolsFactory::UP create_mtf(SearchRequest::SP req) { Matcher::SP matcher = createMatcher(); search::fef::Properties overrides; return matcher->create_match_tools_factory(*req, searchContext, attributeContext, metaStore, overrides); @@ -552,14 +552,14 @@ TEST("require that re-ranking is diverse") { world.setupSecondPhaseRanking(); world.basicResults(); SearchRequest::SP request = world.createSimpleRequest("f1", "spread"); - auto mtf = world.get_mtf(request); + auto mtf = world.create_mtf(request); auto diversity = mtf->createDiversifier(); EXPECT_FALSE(diversity); auto & rankProperies = request->propertiesMap.lookupCreate(MapNames::RANK); rankProperies.add(DiversityAttribute::NAME, "a2") .add(DiversityMinGroups::NAME, "3") .add(DiversityCutoffStrategy::NAME, "strict"); - mtf = world.get_mtf(request); + mtf = world.create_mtf(request); diversity = mtf->createDiversifier(); EXPECT_TRUE(diversity); SearchReply::UP reply = world.performSearch(request, 1); @@ -587,14 +587,14 @@ TEST("require that re-ranking is forced diverse") { world.setupSecondPhaseRanking(); world.basicResults(); SearchRequest::SP request = world.createSimpleRequest("f1", "spread"); - auto mtf = world.get_mtf(request); + auto mtf = world.create_mtf(request); auto diversity = mtf->createDiversifier(); EXPECT_FALSE(diversity); auto & rankProperies = request->propertiesMap.lookupCreate(MapNames::RANK); rankProperies.add(DiversityAttribute::NAME, "a3") .add(DiversityMinGroups::NAME, "3") .add(DiversityCutoffStrategy::NAME, "strict"); - mtf = world.get_mtf(request); + mtf = world.create_mtf(request); diversity = mtf->createDiversifier(); EXPECT_TRUE(diversity); SearchReply::UP reply = world.performSearch(request, 1); |