Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Byko-Ianko <v.bykoianko@corp.mail.ru>2016-08-11 09:27:08 +0300
committerVladimir Byko-Ianko <v.bykoianko@corp.mail.ru>2016-08-19 13:54:06 +0300
commit58c9b5e5989dc27d2637ca87670f27d9c5862832 (patch)
treeba829b40c2dacb329beed568fb4e681189440b1e /routing
parentae4521e95661f4dd823bf6e28204513521935b8b (diff)
Review fixes.
Diffstat (limited to 'routing')
-rw-r--r--routing/routing_integration_tests/get_altitude_test.cpp21
1 files changed, 12 insertions, 9 deletions
diff --git a/routing/routing_integration_tests/get_altitude_test.cpp b/routing/routing_integration_tests/get_altitude_test.cpp
index 04bdff4df9..663fa87656 100644
--- a/routing/routing_integration_tests/get_altitude_test.cpp
+++ b/routing/routing_integration_tests/get_altitude_test.cpp
@@ -24,8 +24,8 @@ namespace
{
using namespace feature;
-void TestAltitudeOfAllMwmFeatures(string const & countryId, TAltitude const minAltitudeMeters,
- TAltitude const maxAltitudeMeters)
+void TestAltitudeOfAllMwmFeatures(string const & countryId, TAltitude const altitudeLowerBoundMeters,
+ TAltitude const altitudeUpperBoundMeters)
{
Index index;
platform::LocalCountryFile const country = platform::LocalCountryFile::MakeForTesting(countryId);
@@ -56,20 +56,23 @@ void TestAltitudeOfAllMwmFeatures(string const & countryId, TAltitude const minA
TAltitudes altitudes = altitudeLoader->GetAltitudes(id, pointsCount);
TEST(!altitudes.empty(),
- ("Empty altidude vector. MWM:", countryId, ", feature id:", id, ", altitudes:", altitudes));
+ ("Empty altitude vector. MWM:", countryId, ", feature id:", id, ", altitudes:", altitudes));
- for (auto const alitude : altitudes)
+ for (auto const altitude : altitudes)
{
- TEST_EQUAL(my::clamp(alitude, minAltitudeMeters, maxAltitudeMeters), alitude,
- ("Unexpected altidude. MWM:", countryId, ", feature id:", id, ", altitudes:", altitudes));
+ TEST_EQUAL(my::clamp(altitude, altitudeLowerBoundMeters, altitudeUpperBoundMeters), altitude,
+ ("Unexpected altitude. MWM:", countryId, ", feature id:", id, ", altitudes:", altitudes));
}
});
}
UNIT_TEST(AllMwmFeaturesGetAltitudeTest)
{
- TestAltitudeOfAllMwmFeatures("Russia_Moscow", 50 /* minAltitudeMeters */, 300 /* maxAltitudeMeters */);
- TestAltitudeOfAllMwmFeatures("Nepal_Kathmandu", 250 /* minAltitudeMeters */, 6000 /* maxAltitudeMeters */);
- TestAltitudeOfAllMwmFeatures("Netherlands_North Holland_Amsterdam", -25 /* minAltitudeMeters */, 50 /* maxAltitudeMeters */);
+ TestAltitudeOfAllMwmFeatures("Russia_Moscow", 50 /* altitudeLowerBoundMeters */,
+ 300 /* altitudeUpperBoundMeters */);
+ TestAltitudeOfAllMwmFeatures("Nepal_Kathmandu", 250 /* altitudeLowerBoundMeters */,
+ 6000 /* altitudeUpperBoundMeters */);
+ TestAltitudeOfAllMwmFeatures("Netherlands_North Holland_Amsterdam", -25 /* altitudeLowerBoundMeters */,
+ 50 /* altitudeUpperBoundMeters */);
}
} // namespace