diff --git a/routing/routing_integration_tests/bicycle_turn_test.cpp b/routing/routing_integration_tests/bicycle_turn_test.cpp index 09f64b1f1e..962da0a9c0 100644 --- a/routing/routing_integration_tests/bicycle_turn_test.cpp +++ b/routing/routing_integration_tests/bicycle_turn_test.cpp @@ -25,8 +25,8 @@ UNIT_TEST(RussiaMoscowSevTushinoParkBicycleWayTurnTest) {CarDirection::GoStraight, CarDirection::TurnSlightRight}); integration::GetNthTurn(route, 2).TestValid().TestDirection(CarDirection::TurnLeft); integration::GetNthTurn(route, 3).TestValid().TestOneOfDirections( - {CarDirection::TurnSlightLeft, CarDirection::TurnLeft}); - integration::TestRouteLength(route, 1054.0); + {CarDirection::TurnSlightRight, CarDirection::TurnRight}); + integration::TestRouteLength(route, 753.0); } UNIT_TEST(RussiaMoscowGerPanfilovtsev22BicycleWayTurnTest) @@ -138,7 +138,8 @@ UNIT_TEST(RussiaMoscowSvobodiOnewayBicycleWayTurnTest) integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::TurnSlightRight); integration::GetNthTurn(route, 2).TestValid().TestDirection(CarDirection::TurnSlightLeft); integration::GetNthTurn(route, 3).TestValid().TestDirection(CarDirection::GoStraight); - integration::GetNthTurn(route, 4).TestValid().TestDirection(CarDirection::TurnRight); + integration::GetNthTurn(route, 4).TestValid().TestOneOfDirections( + {CarDirection::TurnSlightRight, CarDirection::TurnRight}); integration::GetNthTurn(route, 5).TestValid().TestDirection(CarDirection::TurnLeft); integration::GetNthTurn(route, 6).TestValid().TestDirection(CarDirection::TurnLeft); diff --git a/routing/routing_tests/turns_generator_test.cpp b/routing/routing_tests/turns_generator_test.cpp index 5649fe4031..b955f62305 100644 --- a/routing/routing_tests/turns_generator_test.cpp +++ b/routing/routing_tests/turns_generator_test.cpp @@ -330,26 +330,34 @@ UNIT_TEST(TestCheckUTurnOnRoute) TUnpackedPathSegments pathSegments(4, LoadedPathSegment()); pathSegments[0].m_name = "A road"; pathSegments[0].m_weight = 1; - pathSegments[0].m_segmentRange = SegmentRange(FeatureID(), 0 /* start seg id */, 1 /* end seg id */, - true /* forward */); pathSegments[0].m_highwayClass = ftypes::HighwayClass::Trunk; pathSegments[0].m_onRoundabout = false; pathSegments[0].m_isLink = false; pathSegments[0].m_path = {{{0, 0}, 0}, {{0, 1}, 0}}; + pathSegments[0].m_segmentRange = SegmentRange(FeatureID(), 0 /* start seg id */, 1 /* end seg id */, + true /* forward */, + pathSegments[0].m_path.front().GetPoint(), + pathSegments[0].m_path.back().GetPoint()); pathSegments[1] = pathSegments[0]; pathSegments[1].m_segmentRange = SegmentRange(FeatureID(), 1 /* start seg id */, 2 /* end seg id */, - true /* forward */); + true /* forward */, + pathSegments[1].m_path.front().GetPoint(), + pathSegments[1].m_path.back().GetPoint()); pathSegments[1].m_path = {{{0, 1}, 0}, {{0, 0}, 0}}; pathSegments[2] = pathSegments[0]; pathSegments[2].m_segmentRange = SegmentRange(FeatureID(), 2 /* start seg id */, 3 /* end seg id */, - true /* forward */); + true /* forward */, + pathSegments[2].m_path.front().GetPoint(), + pathSegments[2].m_path.back().GetPoint()); pathSegments[2].m_path = {{{0, 0}, 0}, {{0, 1}, 0}}; pathSegments[3] = pathSegments[0]; pathSegments[3].m_segmentRange = SegmentRange(FeatureID(), 3 /* start seg id */, 4 /* end seg id */, - true /* forward */); + true /* forward */, + pathSegments[3].m_path.front().GetPoint(), + pathSegments[3].m_path.back().GetPoint()); pathSegments[3].m_path.clear(); // Zigzag test.