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

[routing] fix tests

Browse source
This commit is contained in:
gmoryes 2020-01-16 14:56:09 +03:00 • committed by Vladimir Byko-Ianko
parent 3a13e465a8
commit 8e11ef6f29
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
routing/routing_tests/route_tests.cpp
View file

@ -110,19 +110,19 @@ UNIT_TEST(DistanceToCurrentTurnTest)
());
TEST_EQUAL(turn, kTestTurns[0], ());
route.MoveIteratorToReal(GetGps(0, 0.5));
route.MoveIterator(GetGps(0, 0.5));
route.GetCurrentTurn(distance, turn);
TEST(base::AlmostEqualAbs(distance,
mercator::DistanceOnEarth({0, 0.5}, kTestGeometry[1]), 0.1), ());
TEST_EQUAL(turn, kTestTurns[0], ());
route.MoveIteratorToReal(GetGps(1, 1.5));
route.MoveIterator(GetGps(1, 1.5));
route.GetCurrentTurn(distance, turn);
TEST(base::AlmostEqualAbs(distance,
mercator::DistanceOnEarth({1, 1.5}, kTestGeometry[4]), 0.1), ());
TEST_EQUAL(turn, kTestTurns[2], ());
route.MoveIteratorToReal(GetGps(1, 2.5));
route.MoveIterator(GetGps(1, 2.5));
route.GetCurrentTurn(distance, turn);
TEST(base::AlmostEqualAbs(distance,
mercator::DistanceOnEarth({1, 2.5}, kTestGeometry[4]), 0.1), ());
@ -146,13 +146,13 @@ UNIT_TEST(NextTurnTest)
TEST_EQUAL(turn, kTestTurns[0], ());
TEST_EQUAL(nextTurn, kTestTurns[1], ());
route.MoveIteratorToReal(GetGps(0.5, 1));
route.MoveIterator(GetGps(0.5, 1));
route.GetCurrentTurn(distance, turn);
route.GetNextTurn(nextDistance, nextTurn);
TEST_EQUAL(turn, kTestTurns[1], ());
TEST_EQUAL(nextTurn, kTestTurns[2], ());
route.MoveIteratorToReal(GetGps(1, 1.5));
route.MoveIterator(GetGps(1, 1.5));
route.GetCurrentTurn(distance, turn);
route.GetNextTurn(nextDistance, nextTurn);
TEST_EQUAL(turn, kTestTurns[2], ());
@ -183,7 +183,7 @@ UNIT_TEST(NextTurnsTest)
{
double const x = 0.;
double const y = 0.5;
route.MoveIteratorToReal(GetGps(x, y));
route.MoveIterator(GetGps(x, y));
TEST(route.GetNextTurns(turnsDist), ());
TEST_EQUAL(turnsDist.size(), 2, ());
double const firstSegLenM = mercator::DistanceOnEarth({x, y}, kTestGeometry[1]);
@ -196,7 +196,7 @@ UNIT_TEST(NextTurnsTest)
{
double const x = 1.;
double const y = 2.5;
route.MoveIteratorToReal(GetGps(x, y));
route.MoveIterator(GetGps(x, y));
TEST(route.GetNextTurns(turnsDist), ());
TEST_EQUAL(turnsDist.size(), 1, ());
double const firstSegLenM = mercator::DistanceOnEarth({x, y}, kTestGeometry[4]);
@ -206,7 +206,7 @@ UNIT_TEST(NextTurnsTest)
{
double const x = 1.;
double const y = 3.5;
route.MoveIteratorToReal(GetGps(x, y));
route.MoveIterator(GetGps(x, y));
TEST(route.GetNextTurns(turnsDist), ());
TEST_EQUAL(turnsDist.size(), 1, ());
}
@ -240,7 +240,7 @@ UNIT_TEST(SelfIntersectedRouteMatchingTest)
location::GpsInfo const & expectedMatchingPos,
size_t expectedIndexInRoute) {
location::RouteMatchingInfo routeMatchingInfo;
route.MoveIteratorToReal(pos);
route.MoveIterator(pos);
location::GpsInfo matchedPos = pos;
route.MatchLocationToRoute(matchedPos, routeMatchingInfo);
TEST_LESS(mercator::DistanceOnEarth(
@ -309,7 +309,7 @@ UNIT_TEST(RouteNameTest)
location::GpsInfo info;
info.m_longitude = 1.0;
info.m_latitude = 2.0;
route.MoveIteratorToReal(info);
route.MoveIterator(info);
route.GetCurrentStreetName(name);
TEST_EQUAL(name, "Street2", ());
}