diff --git a/routing/routing_integration_tests/bicycle_turn_test.cpp b/routing/routing_integration_tests/bicycle_turn_test.cpp index 8c92f34a58..bfaf73bd97 100644 --- a/routing/routing_integration_tests/bicycle_turn_test.cpp +++ b/routing/routing_integration_tests/bicycle_turn_test.cpp @@ -61,10 +61,11 @@ UNIT_TEST(RussiaMoscowSalameiNerisPossibleTurnCorrectionBicycleWayTurnTest) RouterResultCode const result = routeResult.second; TEST_EQUAL(result, RouterResultCode::NoError, ()); - integration::TestTurnCount(route, 3 /* expectedTurnCount */); - integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::TurnRight); - integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::TurnLeft); - integration::GetNthTurn(route, 2).TestValid().TestDirection(CarDirection::TurnSlightRight); + integration::TestTurnCount(route, 4 /* expectedTurnCount */); + integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::TurnSlightRight); + integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::TurnSlightRight); + integration::GetNthTurn(route, 2).TestValid().TestDirection(CarDirection::TurnLeft); + integration::GetNthTurn(route, 3).TestValid().TestDirection(CarDirection::TurnSlightRight); } UNIT_TEST(RussiaMoscowSalameiNerisNoUTurnBicycleWayTurnTest) @@ -78,11 +79,9 @@ UNIT_TEST(RussiaMoscowSalameiNerisNoUTurnBicycleWayTurnTest) RouterResultCode const result = routeResult.second; TEST_EQUAL(result, RouterResultCode::NoError, ()); - integration::TestTurnCount(route, 4 /* expectedTurnCount */); - integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::TurnRight); - integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::TurnSlightRight); - integration::GetNthTurn(route, 2).TestValid().TestDirection(CarDirection::TurnRight); - integration::GetNthTurn(route, 3).TestValid().TestDirection(CarDirection::TurnSlightRight); + integration::TestTurnCount(route, 2 /* expectedTurnCount */); + integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::TurnLeft); + integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::TurnLeft); } UNIT_TEST(RussiaMoscowSevTushinoParkBicycleOnePointOnewayRoadTurnTest) diff --git a/routing/routing_integration_tests/street_names_test.cpp b/routing/routing_integration_tests/street_names_test.cpp index 631eae3fb1..50dabe4226 100644 --- a/routing/routing_integration_tests/street_names_test.cpp +++ b/routing/routing_integration_tests/street_names_test.cpp @@ -52,7 +52,7 @@ UNIT_TEST(RussiaTulskayaToPaveletskayaStreetNamesTest) MoveRoute(route, ms::LatLon(55.73034, 37.63099)); integration::TestCurrentStreetName(route, "Валовая улица"); - integration::TestNextStreetName(route, "Валовая улица"); + integration::TestNextStreetName(route, ""); MoveRoute(route, ms::LatLon(55.730912, 37.636191)); diff --git a/routing/routing_integration_tests/turn_test.cpp b/routing/routing_integration_tests/turn_test.cpp index a44d6bb75b..52a827c2d4 100644 --- a/routing/routing_integration_tests/turn_test.cpp +++ b/routing/routing_integration_tests/turn_test.cpp @@ -946,8 +946,7 @@ UNIT_TEST(RussiaMoscowMinskia1TurnTest) RouterResultCode const result = routeResult.second; TEST_EQUAL(result, RouterResultCode::NoError, ()); - integration::TestTurnCount(route, 1 /* expectedTurnCount */); - integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::GoStraight); + integration::TestTurnCount(route, 0 /* expectedTurnCount */); } UNIT_TEST(RussiaMoscowMinskia2TurnTest) @@ -961,8 +960,9 @@ UNIT_TEST(RussiaMoscowMinskia2TurnTest) RouterResultCode const result = routeResult.second; TEST_EQUAL(result, RouterResultCode::NoError, ()); - integration::TestTurnCount(route, 1 /* expectedTurnCount */); + integration::TestTurnCount(route, 2 /* expectedTurnCount */); integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::TurnRight); + integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::TurnSlightRight); } // This test on getting correct (far enough) outgoing turn point (result of method GetPointForTurn())