kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Review fixes.

Browse source
This commit is contained in:
Yuri Gorshenin 2017-11-07 19:23:27 +03:00 • committed by Vlad Mihaylenko
parent 336e4f994d
commit f79e311e5e
4 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
map/map_tests/search_api_tests.cpp
View file

@ -1,6 +1,6 @@
// NOTE: the purpose of this test is to test interaction between
// SearchAPI and search engine. If you would like to test search
// engine behaviour, please, consider to implement one more search
// engine behaviour, please, consider implementing another search
// integration test.
#include "testing/testing.hpp"
@ -73,7 +73,7 @@ protected:
SearchAPI m_api;
};
UNIT_CLASS_TEST(SearchAPITest, MultipleViewportRequests)
UNIT_CLASS_TEST(SearchAPITest, MultipleViewportsRequests)
{
TestCafe cafe1(m2::PointD(0, 0), "cafe 1", "en");
TestCafe cafe2(m2::PointD(0, 0), "cafe 2", "en");

5
search/search_integration_tests/helpers.cpp
View file

@ -15,8 +15,7 @@ SearchTest::SearchTest()
: m_scopedLog(LDEBUG)
, m_engine(m_index, make_unique<storage::CountryInfoGetterForTesting>(), Engine::Params{})
{
SetViewport(m2::RectD(MercatorBounds::minX, MercatorBounds::minY, MercatorBounds::maxX,
MercatorBounds::maxY));
SetViewport(MercatorBounds::FullRect());
}
void SearchTest::RegisterCountry(string const & name, m2::RectD const & rect)
@ -91,7 +90,7 @@ size_t SearchTest::CountFeatures(m2::RectD const & rect)
}
// static
void SearchTest::OnMwmBuilded(MwmInfo const & info)
void SearchTest::OnMwmBuilt(MwmInfo const & info)
{
switch (info.GetType())
{

2
search/search_integration_tests/helpers.hpp
View file

@ -49,7 +49,7 @@ public:
size_t CountFeatures(m2::RectD const & rect);
protected:
void OnMwmBuilded(MwmInfo const & /* info */) override;
void OnMwmBuilt(MwmInfo const & /* info */) override;
my::ScopedLogLevelChanger m_scopedLog;

4
search/search_tests_support/test_with_custom_mwms.hpp
View file

@ -56,7 +56,7 @@ public:
auto const id = result.first;
auto const info = id.GetInfo();
CHECK(info.get(), ());
OnMwmBuilded(*info);
OnMwmBuilt(*info);
return id;
}
@ -84,7 +84,7 @@ public:
protected:
static void Cleanup(platform::LocalCountryFile const & file);
virtual void OnMwmBuilded(MwmInfo const & /* info */) {}
virtual void OnMwmBuilt(MwmInfo const & /* info */) {}
Index m_index;
std::vector<platform::LocalCountryFile> m_files;