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

Merge pull request #2649 from ygorshenin/simplify-search-integration-tests

Browse source 
[search] Simplifications for search integration tests.
This commit is contained in:
Viktor Govako 2016-03-31 17:46:22 +03:00
commit 6fcb1e5510
2 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
search/search_integration_tests/helpers.hpp
View file

@ -37,8 +37,17 @@ public:
SearchTest();
~SearchTest();
// Registers country in internal records. Note that physical country
// file may be absent.
void RegisterCountry(string const & name, m2::RectD const & rect);
// Creates a physical country file on a disk, which will be removed
// at the end of the test. |fn| is a delegate that accepts a single
// argument - TestMwmBuilder and adds all necessary features to the
// country file.
//
// *NOTE* when |type| is feature::DataHeader::country, the country
// with |name| will be automatically registered.
template <typename TBuildFn>
MwmSet::MwmId BuildMwm(string const & name, feature::DataHeader::MapType type, TBuildFn && fn)
{
@ -50,9 +59,17 @@ public:
tests_support::TestMwmBuilder builder(file, type);
fn(builder);
}
auto result = m_engine.RegisterMap(file);
ASSERT_EQUAL(result.second, MwmSet::RegResult::Success, ());
return result.first;
CHECK_EQUAL(result.second, MwmSet::RegResult::Success, ());
auto const & id = result.first;
if (type == feature::DataHeader::country)
{
if (auto const & info = id.GetInfo())
RegisterCountry(name, info->m_limitRect);
}
return id;
}
inline void SetViewport(m2::RectD const & viewport) { m_viewport = viewport; }

11
search/search_integration_tests/search_query_v2_test.cpp
View file

@ -103,10 +103,7 @@ UNIT_CLASS_TEST(SearchQueryV2Test, Smoke)
builder.Add(lantern2);
});
RegisterCountry(countryName, m2::RectD(m2::PointD(-1.0, -1.0), m2::PointD(10.1, 10.1)));
SetViewport(m2::RectD(m2::PointD(-1.0, -1.0), m2::PointD(1.0, 1.0)));
{
TRules rules = {ExactMatch(wonderlandId, busStop)};
TEST(ResultsMatch("Bus stop", rules), ());
@ -182,7 +179,6 @@ UNIT_CLASS_TEST(SearchQueryV2Test, SearchInWorld)
builder.Add(wonderland);
builder.Add(losAlamos);
});
RegisterCountry(countryName, m2::RectD(m2::PointD(-1.0, -1.0), m2::PointD(1.0, 1.0)));
SetViewport(m2::RectD(m2::PointD(-1.0, -1.0), m2::PointD(-0.5, -0.5)));
@ -219,10 +215,8 @@ UNIT_CLASS_TEST(SearchQueryV2Test, SearchByName)
builder.Add(hydePark);
builder.Add(cafe);
});
RegisterCountry(countryName, m2::RectD(m2::PointD(0, 0), m2::PointD(2, 2)));
SetViewport(m2::RectD(m2::PointD(-1.0, -1.0), m2::PointD(-0.9, -0.9)));
{
TRules rules = {ExactMatch(wonderlandId, hydePark)};
TEST(ResultsMatch("hyde park", rules), ());
@ -251,7 +245,7 @@ UNIT_CLASS_TEST(SearchQueryV2Test, DisableSuggests)
builder.Add(london1);
builder.Add(london2);
});
RegisterCountry("Wonderland", m2::RectD(m2::PointD(-2, -2), m2::PointD(2, 2)));
SetViewport(m2::RectD(m2::PointD(0.5, 0.5), m2::PointD(1.5, 1.5)));
{
SearchParams params;
@ -288,12 +282,11 @@ UNIT_CLASS_TEST(SearchQueryV2Test, TestRankingInfo)
{
builder.Add(sanFrancisco);
});
auto wonderlandId = BuildMwm(countryName, feature::DataHeader::country, [&](TestMwmBuilder & builder)
auto wonderlandId = BuildMwm(countryName, feature::DataHeader::country, [&](TestMwmBuilder & builder)
{
builder.Add(goldenGateStreet);
builder.Add(goldenGateBridge);
});
RegisterCountry("Wonderland", m2::RectD(m2::PointD(-2, -2), m2::PointD(2, 2)));
SetViewport(m2::RectD(m2::PointD(-0.5, -0.5), m2::PointD(0.5, 0.5)));
{