diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-08-20 14:47:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-20 14:47:39 +0200 |
commit | 2d68435a3261b3a70c472ab5138d39a5074cf9d5 (patch) | |
tree | a02190d11c90148a44c41964d412abbabed1d3d9 /streamingvisitors/src/tests | |
parent | b214393ad98132794d6c7a09f00599541c6ed372 (diff) |
Revert "Revert "Balder/use an actual fieldset repo""
Diffstat (limited to 'streamingvisitors/src/tests')
-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 18cd7fab2b8..216e02c5edd 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(); + ~SearchVisitorTest() override; int Main() override; }; @@ -46,9 +46,9 @@ SearchVisitorTest::SearchVisitorTest() : { _componentRegister.setNodeInfo("mycluster", lib::NodeType::STORAGE, 1); _componentRegister.setClock(_clock); - StorageComponent::DocumentTypeRepoSP repo(new DocumentTypeRepo(readDocumenttypesConfig(TEST_PATH("cfg/documenttypes.cfg")))); + auto repo = std::make_shared<DocumentTypeRepo>(readDocumenttypesConfig(TEST_PATH("cfg/documenttypes.cfg"))); _componentRegister.setDocumentTypeRepo(repo); - _component.reset(new StorageComponent(_componentRegister, "storage")); + _component = std::make_unique<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") != NULL); - EXPECT_TRUE(_env.getRankManager("simple") != NULL); + EXPECT_TRUE(_env.getVSMAdapter("simple") != nullptr); + EXPECT_TRUE(_env.getRankManager("simple") != nullptr); } void |