diff options
| author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2018-02-14 19:01:23 +0300 |
|---|---|---|
| committer | mpimenov <mpimenov@users.noreply.github.com> | 2018-02-26 15:39:04 +0300 |
| commit | 9cf52b03681d3ac5f748b3f6fc75aef64b0fb6cc (patch) | |
| tree | 673056b855a3a2ae945a8673b7a9cd7033da0e60 /routing | |
| parent | 04fbed9f22f487c47212651ae333b3cdad8ec6e5 (diff) | |
Fixing routing integration tests after stop discarding junctions if all turn candidates go straight or make only slight turns.
Diffstat (limited to 'routing')
| -rw-r--r-- | routing/routing_integration_tests/bicycle_turn_test.cpp | 10 | ||||
| -rw-r--r-- | routing/routing_integration_tests/street_names_test.cpp | 2 | ||||
| -rw-r--r-- | routing/routing_integration_tests/turn_test.cpp | 3 |
3 files changed, 9 insertions, 6 deletions
diff --git a/routing/routing_integration_tests/bicycle_turn_test.cpp b/routing/routing_integration_tests/bicycle_turn_test.cpp index 962da0a9c0..337ef612ea 100644 --- a/routing/routing_integration_tests/bicycle_turn_test.cpp +++ b/routing/routing_integration_tests/bicycle_turn_test.cpp @@ -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); } diff --git a/routing/routing_integration_tests/street_names_test.cpp b/routing/routing_integration_tests/street_names_test.cpp index e0aca3daa8..2f9af27893 100644 --- a/routing/routing_integration_tests/street_names_test.cpp +++ b/routing/routing_integration_tests/street_names_test.cpp @@ -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)); diff --git a/routing/routing_integration_tests/turn_test.cpp b/routing/routing_integration_tests/turn_test.cpp index dd1ce54537..54ed125ee8 100644 --- a/routing/routing_integration_tests/turn_test.cpp +++ b/routing/routing_integration_tests/turn_test.cpp @@ -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) |