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

[styles] Fix tests to skip the merged style

Browse source
This commit is contained in:
Ilya Zverev 2016-01-19 12:11:54 +03:00
parent 152e509fb2
commit 959f30505d
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
map/style_tests/classificator_tests.cpp
View file

@ -42,9 +42,12 @@ namespace
for (size_t s = 0; s < MapStyleCount; ++s)
{
MapStyle const mapStyle = static_cast<MapStyle>(s);
GetStyleReader().SetCurrentStyle(mapStyle);
LOG(LINFO, ("Test with map style", mapStyle));
fn();
if (mapStyle != MapStyle::MapStyleMerged)
{
GetStyleReader().SetCurrentStyle(mapStyle);
LOG(LINFO, ("Test with map style", mapStyle));
fn();
}
}
}
} // namespace

2
map/style_tests/dashes_test.cpp
View file

@ -19,6 +19,8 @@ UNIT_TEST(Test_Dashes)
for (size_t s = 0; s < MapStyleCount; ++s)
{
MapStyle const mapStyle = static_cast<MapStyle>(s);
if (mapStyle == MapStyleMerged)
continue;
GetStyleReader().SetCurrentStyle(mapStyle);
classificator::Load();

2
map/style_tests/style_symbols_consistency_test.cpp
View file

@ -73,6 +73,8 @@ UNIT_TEST(Test_SymbolsConsistency)
for (size_t s = 0; s < MapStyleCount; ++s)
{
MapStyle const mapStyle = static_cast<MapStyle>(s);
if (mapStyle == MapStyleMerged)
continue;
GetStyleReader().SetCurrentStyle(mapStyle);
classificator::Load();