map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

review fixes

Browse source
This commit is contained in:
Arsentiy Milchakov 2016-08-09 16:53:57 +03:00
parent 80e51df00a
commit c8607e82ba
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
indexer/indexer_tests/osm_editor_test.cpp
View file

@ -460,14 +460,14 @@ void EditorTest::OnMapDeregisteredTest()
{
auto & editor = osm::Editor::Instance();
auto const gbMwmId = BuildMwm("GB", feature::DataHeader::country, [](TestMwmBuilder & builder)
auto const gbMwmId = BuildMwm("GB", [](TestMwmBuilder & builder)
{
TestCafe cafeLondon(m2::PointD(1.0, 1.0), "London Cafe", "en");
builder.Add(cafeLondon);
});
ASSERT(gbMwmId.IsAlive(), ());
auto const rfMwmId = BuildMwm("RF", feature::DataHeader::country, [](TestMwmBuilder & builder)
auto const rfMwmId = BuildMwm("RF", [](TestMwmBuilder & builder)
{
TestCafe cafeMoscow(m2::PointD(2.0, 2.0), "Moscow Cafe", "en");
builder.Add(cafeMoscow);
@ -572,14 +572,14 @@ void EditorTest::HaveMapEditsToUploadTest()
{
auto & editor = osm::Editor::Instance();
auto const gbMwmId = BuildMwm("GB", feature::DataHeader::country, [](TestMwmBuilder & builder)
auto const gbMwmId = BuildMwm("GB", [](TestMwmBuilder & builder)
{
TestCafe cafeLondon(m2::PointD(1.0, 1.0), "London Cafe", "en");
builder.Add(cafeLondon);
});
ASSERT(gbMwmId.IsAlive(), ());
auto const rfMwmId = BuildMwm("RF", feature::DataHeader::country, [](TestMwmBuilder & builder)
auto const rfMwmId = BuildMwm("RF", [](TestMwmBuilder & builder)
{
TestCafe cafeMoscow(m2::PointD(2.0, 2.0), "Moscow Cafe", "ru");
builder.Add(cafeMoscow);

17
indexer/indexer_tests/osm_editor_test.hpp
View file

@ -39,18 +39,18 @@ private:
template <typename TBuildFn>
MwmSet::MwmId ConstructTestMwm(TBuildFn && fn)
{
return BuildMwm("TestCountry", feature::DataHeader::country, forward<TBuildFn>(fn));
return BuildMwm("TestCountry", forward<TBuildFn>(fn));
}
template <typename TBuildFn>
MwmSet::MwmId BuildMwm(string const & name, feature::DataHeader::MapType type, TBuildFn && fn)
MwmSet::MwmId BuildMwm(string const & name, TBuildFn && fn)
{
m_mwmFiles.emplace_back(GetPlatform().WritableDir(), platform::CountryFile(name), 0 /* version */);
auto & file = m_mwmFiles.back();
Cleanup(file);
{
generator::tests_support::TestMwmBuilder builder(file, type);
generator::tests_support::TestMwmBuilder builder(file, feature::DataHeader::country);
fn(builder);
}
@ -58,12 +58,11 @@ private:
CHECK_EQUAL(result.second, MwmSet::RegResult::Success, ());
auto const & id = result.first;
if (type == feature::DataHeader::country)
{
auto const & info = id.GetInfo();
if (info)
m_infoGetter.AddCountry(storage::CountryDef(name, info->m_limitRect));
}
auto const & info = id.GetInfo();
if (info)
m_infoGetter.AddCountry(storage::CountryDef(name, info->m_limitRect));
return id;
}