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

[tests] Prettify OsmType_XXX tests.

Browse source 
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
This commit is contained in:
Viktor Govako 2022-01-20 10:06:50 +03:00
parent 0dec081af9
commit eeafca5741
1 changed files with 43 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
generator/generator_tests/osm_type_test.cpp
View file

@ -26,24 +26,6 @@ using namespace tests;
using Tags = std::vector<OsmElement::Tag>;
void DumpTypes(std::vector<uint32_t> const & v)
{
Classificator const & c = classif();
for (size_t i = 0; i < v.size(); ++i)
std::cout << c.GetFullObjectName(v[i]) << std::endl;
}
void DumpParsedTypes(Tags const & tags)
{
OsmElement e;
FillXmlElement(tags, &e);
FeatureBuilderParams params;
ftype::GetNameAndType(&e, params);
DumpTypes(params.m_types);
}
void TestSurfaceTypes(std::string const & surface, std::string const & smoothness,
std::string const & grade, char const * value)
{
@ -76,6 +58,9 @@ FeatureBuilderParams GetFeatureBuilderParams(Tags const & tags)
FillXmlElement(tags, &e);
FeatureBuilderParams params;
static TagReplacer tagReplacer(GetPlatform().ResourcesDir() + REPLACED_TAGS_FILE);
tagReplacer.Process(e);
ftype::GetNameAndType(&e, params);
return params;
}
@ -98,36 +83,48 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SkipDummy)
UNIT_CLASS_TEST(TestWithClassificator, OsmType_Check)
{
Tags const tags1 = {
{ "highway", "primary" },
{ "motorroad", "yes" },
{ "name", "Каширское шоссе" },
{ "oneway", "yes" }
};
{
Tags const tags = {
{ "highway", "primary" },
{ "motorroad", "yes" },
{ "name", "Каширское шоссе" },
{ "oneway", "yes" }
};
Tags const tags2 = {
{ "highway", "primary" },
{ "name", "Каширское шоссе" },
{ "oneway", "-1" },
{ "motorroad", "yes" }
};
auto const params = GetFeatureBuilderParams(tags);
Tags const tags3 = {
{ "admin_level", "4" },
{ "border_type", "state" },
{ "boundary", "administrative" }
};
TEST_EQUAL(params.m_types.size(), 2, (params));
TEST(params.IsTypeExist(GetType({"highway", "primary"})), ());
TEST(params.IsTypeExist(GetType({"hwtag", "oneway"})), ());
}
Tags const tags4 = {
{ "border_type", "state" },
{ "admin_level", "4" },
{ "boundary", "administrative" }
};
{
Tags const tags = {
{ "highway", "primary" },
{ "name", "Каширское шоссе" },
{ "oneway", "-1" },
{ "motorroad", "yes" }
};
DumpParsedTypes(tags1);
DumpParsedTypes(tags2);
DumpParsedTypes(tags3);
DumpParsedTypes(tags4);
auto const params = GetFeatureBuilderParams(tags);
TEST_EQUAL(params.m_types.size(), 2, (params));
TEST(params.IsTypeExist(GetType({"highway", "primary"})), ());
TEST(params.IsTypeExist(GetType({"hwtag", "oneway"})), ());
}
{
Tags const tags = {
{ "admin_level", "4" },
{ "border_type", "state" },
{ "boundary", "administrative" }
};
auto const params = GetFeatureBuilderParams(tags);
TEST_EQUAL(params.m_types.size(), 1, (params));
TEST(params.IsTypeExist(GetType({"boundary", "administrative", "4"})), ());
}
}
UNIT_CLASS_TEST(TestWithClassificator, OsmType_Combined)
@ -281,14 +278,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Synonyms)
{ "drinkable", "yes"},
};
OsmElement e;
FillXmlElement(tags, &e);
TagReplacer tagReplacer(GetPlatform().ResourcesDir() + REPLACED_TAGS_FILE);
tagReplacer.Process(e);
FeatureBuilderParams params;
ftype::GetNameAndType(&e, params);
auto const params = GetFeatureBuilderParams(tags);
TEST_EQUAL(params.m_types.size(), 7, (params));
@ -859,14 +849,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Entrance)
{ "barrier", "entrance" },
};
OsmElement e;
FillXmlElement(tags, &e);
TagReplacer tagReplacer(GetPlatform().ResourcesDir() + REPLACED_TAGS_FILE);
tagReplacer.Process(e);
FeatureBuilderParams params;
ftype::GetNameAndType(&e, params);
auto const params = GetFeatureBuilderParams(tags);
TEST_EQUAL(params.m_types.size(), 2, (params));
TEST(params.IsTypeExist(GetType({"entrance"})), (params));