diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-08-19 21:45:34 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-19 21:45:34 +0200 |
commit | a39aced4a87decfb421b5402b0b8b6e5b5a46d4c (patch) | |
tree | cb4b8b79ccd0b9d7d68cbccc9edcd53d001544c6 /streamingvisitors/src/tests/searchvisitor/searchvisitor_test.cpp | |
parent | 39efe3e23b25e7a42982a62357c6fb894c7181ed (diff) | |
parent | 3a9f8a641d5312e83a34f6aa293f98182c90adfe (diff) |
Merge pull request #14106 from vespa-engine/revert-14051-balder/use-an-actual-fieldset-repo
Revert "Balder/use an actual fieldset repo"
Diffstat (limited to 'streamingvisitors/src/tests/searchvisitor/searchvisitor_test.cpp')
-rw-r--r-- | streamingvisitors/src/tests/searchvisitor/searchvisitor_test.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/streamingvisitors/src/tests/searchvisitor/searchvisitor_test.cpp b/streamingvisitors/src/tests/searchvisitor/searchvisitor_test.cpp index 216e02c5edd..18cd7fab2b8 100644 --- a/streamingvisitors/src/tests/searchvisitor/searchvisitor_test.cpp +++ b/streamingvisitors/src/tests/searchvisitor/searchvisitor_test.cpp @@ -35,7 +35,7 @@ private: public: SearchVisitorTest(); - ~SearchVisitorTest() override; + ~SearchVisitorTest(); int Main() override; }; @@ -46,9 +46,9 @@ SearchVisitorTest::SearchVisitorTest() : { _componentRegister.setNodeInfo("mycluster", lib::NodeType::STORAGE, 1); _componentRegister.setClock(_clock); - auto repo = std::make_shared<DocumentTypeRepo>(readDocumenttypesConfig(TEST_PATH("cfg/documenttypes.cfg"))); + StorageComponent::DocumentTypeRepoSP repo(new DocumentTypeRepo(readDocumenttypesConfig(TEST_PATH("cfg/documenttypes.cfg")))); _componentRegister.setDocumentTypeRepo(repo); - _component = std::make_unique<StorageComponent>(_componentRegister, "storage"); + _component.reset(new StorageComponent(_componentRegister, "storage")); } SearchVisitorTest::~SearchVisitorTest() = default; @@ -80,8 +80,8 @@ SearchVisitorTest::testCreateSearchVisitor(const vespalib::string & dir, const v void SearchVisitorTest::testSearchEnvironment() { - EXPECT_TRUE(_env.getVSMAdapter("simple") != nullptr); - EXPECT_TRUE(_env.getRankManager("simple") != nullptr); + EXPECT_TRUE(_env.getVSMAdapter("simple") != NULL); + EXPECT_TRUE(_env.getRankManager("simple") != NULL); } void |