diff options
author | Yuri Gorshenin <y@maps.me> | 2016-09-01 17:23:57 +0300 |
---|---|---|
committer | Yuri Gorshenin <y@maps.me> | 2016-09-01 18:27:59 +0300 |
commit | 30ef25bfb34beab674320723f1bcc598a784fffe (patch) | |
tree | df87e64e58605358d779142f389eca51bde4af1a /indexer/indexer_tests_support | |
parent | a43c309fc7adfbd853133debc712a86be3d149f9 (diff) |
[indexer] Removed indexer dependency on search.
Diffstat (limited to 'indexer/indexer_tests_support')
-rw-r--r-- | indexer/indexer_tests_support/helpers.cpp | 6 | ||||
-rw-r--r-- | indexer/indexer_tests_support/helpers.hpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/indexer/indexer_tests_support/helpers.cpp b/indexer/indexer_tests_support/helpers.cpp index 05392903de..0f748989e8 100644 --- a/indexer/indexer_tests_support/helpers.cpp +++ b/indexer/indexer_tests_support/helpers.cpp @@ -2,16 +2,14 @@ #include "editor/editor_storage.hpp" -#include "std/unique_ptr.hpp" - namespace indexer { namespace tests_support { -void SetUpEditorForTesting(Index & index) +void SetUpEditorForTesting(unique_ptr<osm::Editor::Delegate> delegate) { auto & editor = osm::Editor::Instance(); - editor.SetIndex(index); + editor.SetDelegate(move(delegate)); editor.SetStorageForTesting(make_unique<editor::InMemoryStorage>()); editor.ClearAllLocalEdits(); } diff --git a/indexer/indexer_tests_support/helpers.hpp b/indexer/indexer_tests_support/helpers.hpp index fd3018ffcf..e0001681d2 100644 --- a/indexer/indexer_tests_support/helpers.hpp +++ b/indexer/indexer_tests_support/helpers.hpp @@ -3,6 +3,8 @@ #include "indexer/editable_map_object.hpp" #include "indexer/osm_editor.hpp" +#include "std/unique_ptr.hpp" + #include "base/assert.hpp" class Index; @@ -11,7 +13,7 @@ namespace indexer { namespace tests_support { -void SetUpEditorForTesting(Index & index); +void SetUpEditorForTesting(unique_ptr<osm::Editor::Delegate> delegate); template <typename TFn> void EditFeature(FeatureType const & ft, TFn && fn) |