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

[routing] routing integration tests fixing.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2019-07-05 10:49:53 +03:00 • committed by Vlad Mihaylenko
parent 4a463e3473
commit b9815f7236
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
routing/routing_integration_tests/pedestrian_route_test.cpp
View file

@ -22,7 +22,7 @@ UNIT_TEST(Zgrad424aTo1207)
integration::CalculateRouteAndTestRouteLength(
integration::GetVehicleComponents(VehicleType::Pedestrian),
MercatorBounds::FromLatLon(55.9963, 37.2036), {0., 0.},
MercatorBounds::FromLatLon(55.9955, 37.1948), 683.);
MercatorBounds::FromLatLon(55.9955, 37.1948), 623.2);
}
UNIT_TEST(Zgrad924aTo418)
@ -130,8 +130,8 @@ UNIT_TEST(SwedenStockholmSlussenHiltonToMaritimeMuseum)
{
integration::CalculateRouteAndTestRouteLength(
integration::GetVehicleComponents(VehicleType::Pedestrian),
MercatorBounds::FromLatLon(59.32046, 18.06924), {0., 0.},
MercatorBounds::FromLatLon(59.32728, 18.09078), 3442.);
MercatorBounds::FromLatLon(59.32046, 18.06924), {0.0, 0.0},
MercatorBounds::FromLatLon(59.32751, 18.09092), 3442.0);
}
UNIT_TEST(SwedenStockholmSlussenHiltonToAfChapmanHostel)

4
routing/routing_integration_tests/transit_route_test.cpp
View file

@ -139,7 +139,7 @@ UNIT_TEST(Washington_FoggyToShaw)
TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ());
integration::TestRouteLength(*routeResult.first, 6180.54);
integration::TestRouteLength(*routeResult.first, 5971.0);
CHECK(routeResult.first, ());
integration::CheckSubwayExistence(*routeResult.first);
@ -154,7 +154,7 @@ UNIT_TEST(NewYork_GrassmereToPleasantPlains)
TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ());
integration::TestRouteLength(*routeResult.first, 17409.7);
integration::TestRouteLength(*routeResult.first, 17224.5);
CHECK(routeResult.first, ());
integration::CheckSubwayExistence(*routeResult.first);

6
routing/routing_integration_tests/turn_test.cpp
View file

@ -148,7 +148,7 @@ UNIT_TEST(RussiaMoscowPlanetnayaOnlyStraightTest)
TRouteResult const routeResult =
integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
MercatorBounds::FromLatLon(55.80215, 37.54663), {0., 0.},
MercatorBounds::FromLatLon(55.80169, 37.54915));
MercatorBounds::FromLatLon(55.80186, 37.5496));
Route const & route = *routeResult.first;
RouterResultCode const result = routeResult.second;
@ -161,7 +161,7 @@ UNIT_TEST(RussiaMoscowPlanetnayaOnlyStraightTest)
integration::GetNthTurn(route, 3).TestValid().TestDirection(CarDirection::TurnSlightRight);
integration::GetNthTurn(route, 4).TestValid().TestDirection(CarDirection::TurnRight);
integration::TestRouteLength(route, 454.);
integration::TestRouteLength(route, 418.0);
}
UNIT_TEST(RussiaMoscowNoTurnsOnMKADTurnTest)
@ -239,7 +239,7 @@ UNIT_TEST(RussiaMoscowPankratevskiPerBolshaySuharedskazPloschadTurnTest)
TRouteResult const routeResult =
integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
MercatorBounds::FromLatLon(55.77177, 37.63556), {0., 0.},
MercatorBounds::FromLatLon(55.77217, 37.63678));
MercatorBounds::FromLatLon(55.77224, 37.63748));
Route const & route = *routeResult.first;
RouterResultCode const result = routeResult.second;

8
routing/routing_quality/routing_quality_tests/is_built_tests.cpp
View file

@ -11,13 +11,13 @@ namespace
UNIT_TEST(RoutingQuality_BilbauAirport)
{
// From Bilbau Airport.
TEST(CheckCarRoute({43.3017, -2.9151} /* start */, {43.2805, -2.87853} /* finish */,
{{{43.282, -2.88333}}} /* reference track */),
TEST(CheckCarRoute({43.3017, -2.9151} /* start */, {43.27637, -2.86924} /* finish */,
{{{43.27759, -2.87367}}} /* reference track */),
());
// To Bilbau Airport.
TEST(CheckCarRoute({43.28069, -2.87835} /* start */, {43.2805, -2.87853} /* finish */,
{{{43.28242, -2.88414}}} /* reference track */),
TEST(CheckCarRoute({43.27651, -2.86918} /* start */, {43.2805, -2.87853} /* finish */,
{{{43.27788, -2.87385}}} /* reference track */),
());
}