diff options
Diffstat (limited to 'search/search_tests_support')
5 files changed, 18 insertions, 15 deletions
diff --git a/search/search_tests_support/test_results_matching.cpp b/search/search_tests_support/test_results_matching.cpp index 381f18f876..c6b6f7416e 100644 --- a/search/search_tests_support/test_results_matching.cpp +++ b/search/search_tests_support/test_results_matching.cpp @@ -62,7 +62,7 @@ string AlternativesMatchingRule::ToString() const return os.str(); } -bool MatchResults(DataSourceBase const & dataSource, vector<shared_ptr<MatchingRule>> rules, +bool MatchResults(DataSource const & dataSource, vector<shared_ptr<MatchingRule>> rules, vector<search::Result> const & actual) { vector<FeatureID> resultIds; @@ -100,14 +100,14 @@ bool MatchResults(DataSourceBase const & dataSource, vector<shared_ptr<MatchingR return false; } -bool MatchResults(DataSourceBase const & dataSource, vector<shared_ptr<MatchingRule>> rules, +bool MatchResults(DataSource const & dataSource, vector<shared_ptr<MatchingRule>> rules, search::Results const & actual) { vector<search::Result> const results(actual.begin(), actual.end()); return MatchResults(dataSource, rules, results); } -bool ResultMatches(DataSourceBase const & dataSource, shared_ptr<MatchingRule> rule, +bool ResultMatches(DataSource const & dataSource, shared_ptr<MatchingRule> rule, search::Result const & result) { bool matches = false; diff --git a/search/search_tests_support/test_results_matching.hpp b/search/search_tests_support/test_results_matching.hpp index f6d6fd72d5..0e5c12d57d 100644 --- a/search/search_tests_support/test_results_matching.hpp +++ b/search/search_tests_support/test_results_matching.hpp @@ -11,7 +11,7 @@ #include <vector> class FeatureType; -class DataSourceBase; +class DataSource; namespace generator { @@ -74,11 +74,11 @@ std::shared_ptr<MatchingRule> AlternativesMatch(TArgs &&... args) return std::make_shared<AlternativesMatchingRule>(std::forward<TArgs>(args)...); } -bool MatchResults(DataSourceBase const & dataSource, std::vector<std::shared_ptr<MatchingRule>> rules, +bool MatchResults(DataSource const & dataSource, std::vector<std::shared_ptr<MatchingRule>> rules, std::vector<search::Result> const & actual); -bool MatchResults(DataSourceBase const & dataSource, std::vector<std::shared_ptr<MatchingRule>> rules, +bool MatchResults(DataSource const & dataSource, std::vector<std::shared_ptr<MatchingRule>> rules, search::Results const & actual); -bool ResultMatches(DataSourceBase const & dataSource, std::shared_ptr<MatchingRule> rule, +bool ResultMatches(DataSource const & dataSource, std::shared_ptr<MatchingRule> rule, search::Result const & result); std::string DebugPrint(MatchingRule const & rule); diff --git a/search/search_tests_support/test_search_engine.cpp b/search/search_tests_support/test_search_engine.cpp index a9c8dffff2..54c539bf29 100644 --- a/search/search_tests_support/test_search_engine.cpp +++ b/search/search_tests_support/test_search_engine.cpp @@ -12,13 +12,15 @@ namespace search { namespace tests_support { -TestSearchEngine::TestSearchEngine(DataSourceBase & dataSource, unique_ptr<storage::CountryInfoGetter> infoGetter, +TestSearchEngine::TestSearchEngine(DataSource & dataSource, + unique_ptr<storage::CountryInfoGetter> infoGetter, Engine::Params const & params) - : m_infoGetter(move(infoGetter)), m_engine(dataSource, GetDefaultCategories(), *m_infoGetter, params) + : m_infoGetter(move(infoGetter)) + , m_engine(dataSource, GetDefaultCategories(), *m_infoGetter, params) { } -TestSearchEngine::TestSearchEngine(DataSourceBase & dataSource, Engine::Params const & params) +TestSearchEngine::TestSearchEngine(DataSource & dataSource, Engine::Params const & params) : m_infoGetter(storage::CountryInfoReader::CreateCountryInfoReader(GetPlatform())) , m_engine(dataSource, GetDefaultCategories(), *m_infoGetter, params) { diff --git a/search/search_tests_support/test_search_engine.hpp b/search/search_tests_support/test_search_engine.hpp index bc51c33bac..8fbfb3e05d 100644 --- a/search/search_tests_support/test_search_engine.hpp +++ b/search/search_tests_support/test_search_engine.hpp @@ -7,7 +7,7 @@ #include <memory> #include <string> -class DataSourceBase; +class DataSource; namespace search { @@ -18,9 +18,9 @@ namespace tests_support class TestSearchEngine { public: - TestSearchEngine(DataSourceBase & dataSource, std::unique_ptr<storage::CountryInfoGetter> infoGetter, + TestSearchEngine(DataSource & dataSource, std::unique_ptr<storage::CountryInfoGetter> infoGetter, Engine::Params const & params); - TestSearchEngine(DataSourceBase & dataSource, Engine::Params const & params); + TestSearchEngine(DataSource & dataSource, Engine::Params const & params); void SetLocale(std::string const & locale) { m_engine.SetLocale(locale); } diff --git a/search/search_tests_support/test_with_custom_mwms.hpp b/search/search_tests_support/test_with_custom_mwms.hpp index 606ea08b2e..baed6cab9d 100644 --- a/search/search_tests_support/test_with_custom_mwms.hpp +++ b/search/search_tests_support/test_with_custom_mwms.hpp @@ -1,6 +1,6 @@ #pragma once -#include "editor/editable_data_source.hpp" +#include "editor/editable_feature_source.hpp" #include "editor/editor_tests_support/helpers.hpp" #include "generator/generator_tests_support/test_with_custom_mwms.hpp" @@ -31,7 +31,8 @@ public: template <typename EditorFn> void EditFeature(FeatureID const & id, EditorFn && fn) { - EditableDataSource::FeaturesLoaderGuard loader(m_dataSource, id.m_mwmId); + DataSource::FeaturesLoaderGuard loader(m_dataSource, id.m_mwmId, + EditableFeatureSourceFactory()); FeatureType ft; CHECK(loader.GetFeatureByIndex(id.m_index, ft), ()); editor::tests_support::EditFeature(ft, std::forward<EditorFn>(fn)); |