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

Fixing routing integration tests after stop discarding junctions if all turn candidates go straight or make only slight turns.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2018-02-14 19:01:23 +03:00 • committed by mpimenov
parent 04fbed9f22
commit 9cf52b0368
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
routing/routing_integration_tests/bicycle_turn_test.cpp
View file

@ -18,13 +18,15 @@ UNIT_TEST(RussiaMoscowSevTushinoParkBicycleWayTurnTest)
IRouter::ResultCode const result = routeResult.second;
TEST_EQUAL(result, IRouter::NoError, ());
integration::TestTurnCount(route, 4 /* expectedTurnCount */);
integration::TestTurnCount(route, 5 /* expectedTurnCount */);
integration::GetNthTurn(route, 0).TestValid().TestOneOfDirections(
{CarDirection::GoStraight, CarDirection::TurnSlightLeft});
{CarDirection::TurnSlightRight});
integration::GetNthTurn(route, 1).TestValid().TestOneOfDirections(
{CarDirection::GoStraight, CarDirection::TurnSlightLeft});
integration::GetNthTurn(route, 2).TestValid().TestOneOfDirections(
{CarDirection::GoStraight, CarDirection::TurnSlightRight});
integration::GetNthTurn(route, 2).TestValid().TestDirection(CarDirection::TurnLeft);
integration::GetNthTurn(route, 3).TestValid().TestOneOfDirections(
integration::GetNthTurn(route, 3).TestValid().TestDirection(CarDirection::TurnLeft);
integration::GetNthTurn(route, 4).TestValid().TestOneOfDirections(
{CarDirection::TurnSlightRight, CarDirection::TurnRight});
integration::TestRouteLength(route, 753.0);
}

2
routing/routing_integration_tests/street_names_test.cpp
View file

@ -31,7 +31,7 @@ UNIT_TEST(RussiaTulskayaToPaveletskayaStreetNamesTest)
TEST_EQUAL(result, IRouter::NoError, ());
integration::TestCurrentStreetName(route, "Большая Тульская улица");
integration::TestNextStreetName(route, "Валовая улица");
integration::TestNextStreetName(route, "Подольское шоссе");
MoveRoute(route, ms::LatLon(55.71398, 37.62443));

3
routing/routing_integration_tests/turn_test.cpp
View file

@ -583,7 +583,8 @@ UNIT_TEST(NetherlandsGorinchemBridgeTest)
IRouter::ResultCode const result = routeResult.second;
TEST_EQUAL(result, IRouter::NoError, ());
integration::TestTurnCount(route, 0 /* expectedTurnCount */);
integration::TestTurnCount(route, 1 /* expectedTurnCount */);
integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::TurnSlightLeft);
}
UNIT_TEST(RussiaVoronigProspTrudaTest)