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

[routing] Fixing routing integration tests.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2016-06-17 14:31:24 +03:00
parent 4761fe49c0
commit b52c7947de
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
routing/routing_integration_tests/bicycle_turn_test.cpp
View file

@ -61,9 +61,7 @@ UNIT_TEST(RussiaMoscowSevTushinoParkBicycleOnePointTurnTest)
Route const & route = *routeResult.first;
IRouter::ResultCode const result = routeResult.second;
TEST_EQUAL(result, IRouter::NoError, ());
TEST_EQUAL(route.GetTurns().size(), 0, ());
integration::TestRouteLength(route, 0.0);
TEST_EQUAL(result, IRouter::IRouter::RouteNotFound, ());
}
UNIT_TEST(RussiaMoscowPlanernaiOnewayCarRoadTurnTest)

2
routing/routing_integration_tests/osrm_route_test.cpp
View file

@ -12,7 +12,7 @@ namespace
{
integration::CalculateRouteAndTestRouteLength(
integration::GetOsrmComponents(), MercatorBounds::FromLatLon(19.20789, 30.50663), {0., 0.},
MercatorBounds::FromLatLon(19.17289, 30.47315), 9186.);
MercatorBounds::FromLatLon(19.17289, 30.47315), 10283.7);
}
UNIT_TEST(MoscowShortRoadUnpacking)

9
routing/routing_integration_tests/osrm_turn_test.cpp
View file

@ -57,15 +57,18 @@ UNIT_TEST(RussiaMoscowLenigradskiy39UturnTurnTest)
IRouter::ResultCode const result = routeResult.second;
TEST_EQUAL(result, IRouter::NoError, ());
integration::TestTurnCount(route, 3);
integration::TestTurnCount(route, 4);
integration::GetNthTurn(route, 0)
.TestValid()
.TestDirection(TurnDirection::UTurnLeft);
.TestDirection(TurnDirection::TurnRight);
integration::GetNthTurn(route, 1)
.TestValid()
.TestDirection(TurnDirection::UTurnLeft);
integration::GetNthTurn(route, 2)
.TestValid()
.TestDirection(TurnDirection::TurnRight);
integration::GetNthTurn(route, 2).TestValid().TestDirection(TurnDirection::TurnLeft);
integration::GetNthTurn(route, 3).TestValid().TestDirection(TurnDirection::TurnLeft);
integration::TestRouteLength(route, 2033.);
}