From 58c9b5e5989dc27d2637ca87670f27d9c5862832 Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Thu, 11 Aug 2016 09:27:08 +0300 Subject: [PATCH] Review fixes. --- .../get_altitude_test.cpp | 21 +++++++++++-------- 1 file 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