pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Review fixes.

Browse source
This commit is contained in:
Yuri Gorshenin 2017-11-22 16:50:07 +03:00 • committed by Arsentiy Milchakov
parent 6a8bfe7973
commit f05f483645
3 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
map/search_api.cpp
View file

@ -309,13 +309,12 @@ void SearchAPI::UpdateSponsoredMode(std::string const & query,
m_sponsoredMode = SponsoredMode::Booking;
}
string DebugPrint(SearchAPI::SponsoredMode mode) {
switch (mode) {
case SearchAPI::SponsoredMode::None:
return "None";
case SearchAPI::SponsoredMode::Cian:
return "Cian";
case SearchAPI::SponsoredMode::Booking:
return "Booking";
string DebugPrint(SearchAPI::SponsoredMode mode)
{
switch (mode)
{
case SearchAPI::SponsoredMode::None: return "None";
case SearchAPI::SponsoredMode::Cian: return "Cian";
case SearchAPI::SponsoredMode::Booking: return "Booking";
}
}

18
search/search_integration_tests/interactive_search_test.cpp
View file

@ -17,8 +17,8 @@ namespace
{
struct Stats
{
size_t m_shownResults = 0;
bool m_mode = false;
size_t m_numShownResults = 0;
bool m_hotelDisplacementModeSet = false;
};
class TestDelegate : public ViewportSearchCallback::Delegate
@ -31,16 +31,16 @@ public:
// ViewportSearchCallback::Delegate overrides:
void RunUITask(function<void()> fn) override { fn(); }
void SetHotelDisplacementMode() override { m_stats.m_mode = true; }
void SetHotelDisplacementMode() override { m_stats.m_hotelDisplacementModeSet = true; }
bool IsViewportSearchActive() const override { return true; }
void ShowViewportSearchResults(Results const & results) override
{
m_stats.m_shownResults = results.GetCount();
m_stats.m_numShownResults = results.GetCount();
}
void ClearViewportSearchResults() override { m_stats.m_shownResults = 0; }
void ClearViewportSearchResults() override { m_stats.m_numShownResults = 0; }
private:
Stats & m_stats;
@ -98,8 +98,8 @@ UNIT_CLASS_TEST(InteractiveSearchTest, Smoke)
TRules const rules = {ExactMatch(id, cafes[0]), ExactMatch(id, cafes[1]),
ExactMatch(id, cafes[2]), ExactMatch(id, cafes[3])};
TEST(!stats.m_mode, ());
TEST_EQUAL(stats.m_shownResults, 4, ());
TEST(!stats.m_hotelDisplacementModeSet, ());
TEST_EQUAL(stats.m_numShownResults, 4, ());
TEST(MatchResults(m_index, rules, request.Results()), ());
}
@ -112,8 +112,8 @@ UNIT_CLASS_TEST(InteractiveSearchTest, Smoke)
TRules const rules = {ExactMatch(id, hotels[0]), ExactMatch(id, hotels[1]),
ExactMatch(id, hotels[2]), ExactMatch(id, hotels[3])};
TEST(stats.m_mode, ());
TEST_EQUAL(stats.m_shownResults, 4, ());
TEST(stats.m_hotelDisplacementModeSet, ());
TEST_EQUAL(stats.m_numShownResults, 4, ());
TEST(MatchResults(m_index, rules, request.Results()), ());
}
}

2
search/viewport_search_callback.cpp
View file

@ -34,7 +34,7 @@ void ViewportSearchCallback::operator()(Results const & results)
//
// We don't need to clear old results or show current results if the
// search is cancelled, because:
//
// * current request is cancelled because of the next
// search-in-viewport request - in this case it is the
// responsibility of the next search request to clean up old results