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

Fixing routing_integration_tests for for 26.01.18 map

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2018-02-09 11:26:06 +03:00 • committed by mpimenov
parent 3a4a9ef1fc
commit 3f4e04aa8f
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
routing/routing_integration_tests/bicycle_turn_test.cpp
View file

@ -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);

18
routing/routing_tests/turns_generator_test.cpp
View file

@ -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.