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

Review fixes.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2018-09-24 16:00:14 +03:00 • committed by Vlad Mihaylenko
parent 68ab207964
commit 09c8c1beb9
2 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
routing/routing_integration_tests/route_test.cpp
View file

@ -91,24 +91,19 @@ namespace
MercatorBounds::FromLatLon(55.77691, 37.70428), 150.);
}
// Geometry unpacking test.
UNIT_TEST(RussiaFerryToCrimeaLoadCrossGeometryTest)
{
// Forward
TRouteResult route =
integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
MercatorBounds::FromLatLon(45.34123, 36.67679), {0., 0.},
MercatorBounds::FromLatLon(45.36479, 36.62194));
TEST_EQUAL(route.second, RouterResultCode::NoError, ());
CHECK(route.first, ());
integration::TestRoutePointsNumber(*route.first, 62 /* expected points number */);
// And backward case
route = integration::CalculateRoute(integration::GetVehicleComponents<VehicleType::Car>(),
MercatorBounds::FromLatLon(45.36479, 36.62194), {0., 0.},
MercatorBounds::FromLatLon(45.34123, 36.67679));
TEST_EQUAL(route.second, RouterResultCode::NoError, ());
CHECK(route.first, ());
integration::TestRoutePointsNumber(*route.first, 50 /* expected points number */);
// To Crimea.
integration::CalculateRouteAndTestRouteLength(
integration::GetVehicleComponents<VehicleType::Car>(),
MercatorBounds::FromLatLon(45.34123, 36.67679), {0., 0.},
MercatorBounds::FromLatLon(45.36479, 36.62194), 5365.0);
// From Crimea.
integration::CalculateRouteAndTestRouteLength(
integration::GetVehicleComponents<VehicleType::Car>(),
MercatorBounds::FromLatLon(45.36479, 36.62194), {0., 0.},
MercatorBounds::FromLatLon(45.34123, 36.67679), 5400.0);
}
UNIT_TEST(PriceIslandLoadCrossGeometryTest)

1
routing/routing_integration_tests/routing_test_tools.cpp
View file

@ -240,6 +240,7 @@ namespace integration
CalculateRoute(routerComponents, startPoint, startDirection, finalPoint);
RouterResultCode const result = routeResult.second;
TEST_EQUAL(result, RouterResultCode::NoError, ());
CHECK(routeResult.first, ());
TestRouteLength(*routeResult.first, expectedRouteMeters, relativeError);
}