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

[routing] Unit tests on yescar and nocar tags.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2019-06-24 15:27:11 +03:00 • committed by Maksim Andrianov
parent 87f7f38824
commit 9e34e5efea
2 changed files with 57 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
generator/generator_tests/osm_type_test.cpp
View file

@ -64,6 +64,14 @@ namespace
}
TEST(params.IsTypeExist(GetType({"psurface", value})), ("Surface:", surface, "Smoothness:", smoothness, "Grade:", grade, "Expected:", value, "Got:", psurface));
}
void GetFeatureParams(char const * arr[][2], size_t count, FeatureParams & params)
{
OsmElement e;
FillXmlElement(arr, count, &e);
ftype::GetNameAndType(&e, params);
}
} // namespace
UNIT_CLASS_TEST(TestWithClassificator, OsmType_SkipDummy)
@ -627,6 +635,52 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Ferry)
TEST(params.IsTypeExist(type), ());
}
UNIT_CLASS_TEST(TestWithClassificator, OsmType_YesCarNoCar)
{
routing::CarModel const & carModel = routing::CarModel::AllLimitsInstance();
{
char const* arr[][2] = {
{"highway", "secondary"},
};
FeatureParams params;
GetFeatureParams(arr, ARRAY_SIZE(arr), params);
TEST_EQUAL(params.m_types.size(), 1, (params));
TEST(!params.IsTypeExist(carModel.GetNoCarTypeForTesting()), ());
TEST(!params.IsTypeExist(carModel.GetYesCarTypeForTesting()), ());
}
{
char const* arr[][2] = {
{"highway", "cycleway"},
{"motorcar", "yes"},
};
FeatureParams params;
GetFeatureParams(arr, ARRAY_SIZE(arr), params);
TEST_EQUAL(params.m_types.size(), 2, (params));
TEST(!params.IsTypeExist(carModel.GetNoCarTypeForTesting()), ());
TEST(params.IsTypeExist(carModel.GetYesCarTypeForTesting()), ());
}
{
char const* arr[][2] = {
{"highway", "secondary"},
{"motor_vehicle", "no"},
};
FeatureParams params;
GetFeatureParams(arr, ARRAY_SIZE(arr), params);
TEST_EQUAL(params.m_types.size(), 2, (params));
TEST(params.IsTypeExist(carModel.GetNoCarTypeForTesting()), ());
TEST(!params.IsTypeExist(carModel.GetYesCarTypeForTesting()), ());
}
}
UNIT_CLASS_TEST(TestWithClassificator, OsmType_Boundary)
{
char const * arr[][2] = {

3
routing_common/car_model.hpp
View file

@ -21,6 +21,9 @@ public:
static std::vector<AdditionalRoadTags> const & GetAdditionalTags();
static VehicleModel::SurfaceInitList const & GetSurfaces();
uint32_t GetNoCarTypeForTesting() const { return m_noCarType; }
uint32_t GetYesCarTypeForTesting() const { return m_yesCarType; }
protected:
RoadAvailability GetRoadAvailability(feature::TypesHolder const & types) const override;