Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Byko-Ianko <v.bykoianko@corp.mail.ru>2016-06-17 14:31:24 +0300
committerVladimir Byko-Ianko <v.bykoianko@corp.mail.ru>2016-06-24 13:31:46 +0300
commitb52c7947deb1b7b340127c4eb6f46fcc68c0c24a (patch)
treefc5649920137aed7e9e30144ac2115b27cade540 /routing
parent4761fe49c0b2521b545c814cd7f4a30c9b38d5ff (diff)
[routing] Fixing routing integration tests.
Diffstat (limited to 'routing')
-rw-r--r--routing/routing_integration_tests/bicycle_turn_test.cpp4
-rw-r--r--routing/routing_integration_tests/osrm_route_test.cpp2
-rw-r--r--routing/routing_integration_tests/osrm_turn_test.cpp9
3 files changed, 8 insertions, 7 deletions
diff --git a/routing/routing_integration_tests/bicycle_turn_test.cpp b/routing/routing_integration_tests/bicycle_turn_test.cpp
index d8304815b7..08a15d256c 100644
--- a/routing/routing_integration_tests/bicycle_turn_test.cpp
+++ b/routing/routing_integration_tests/bicycle_turn_test.cpp
@@ -61,9 +61,7 @@ UNIT_TEST(RussiaMoscowSevTushinoParkBicycleOnePointTurnTest)
Route const & route = *routeResult.first;
IRouter::ResultCode const result = routeResult.second;
- TEST_EQUAL(result, IRouter::NoError, ());
- TEST_EQUAL(route.GetTurns().size(), 0, ());
- integration::TestRouteLength(route, 0.0);
+ TEST_EQUAL(result, IRouter::IRouter::RouteNotFound, ());
}
UNIT_TEST(RussiaMoscowPlanernaiOnewayCarRoadTurnTest)
diff --git a/routing/routing_integration_tests/osrm_route_test.cpp b/routing/routing_integration_tests/osrm_route_test.cpp
index 6a876c3e33..1423da1234 100644
--- a/routing/routing_integration_tests/osrm_route_test.cpp
+++ b/routing/routing_integration_tests/osrm_route_test.cpp
@@ -12,7 +12,7 @@ namespace
{
integration::CalculateRouteAndTestRouteLength(
integration::GetOsrmComponents(), MercatorBounds::FromLatLon(19.20789, 30.50663), {0., 0.},
- MercatorBounds::FromLatLon(19.17289, 30.47315), 9186.);
+ MercatorBounds::FromLatLon(19.17289, 30.47315), 10283.7);
}
UNIT_TEST(MoscowShortRoadUnpacking)
diff --git a/routing/routing_integration_tests/osrm_turn_test.cpp b/routing/routing_integration_tests/osrm_turn_test.cpp
index 2bc5deabda..328b68af86 100644
--- a/routing/routing_integration_tests/osrm_turn_test.cpp
+++ b/routing/routing_integration_tests/osrm_turn_test.cpp
@@ -57,15 +57,18 @@ UNIT_TEST(RussiaMoscowLenigradskiy39UturnTurnTest)
IRouter::ResultCode const result = routeResult.second;
TEST_EQUAL(result, IRouter::NoError, ());
- integration::TestTurnCount(route, 3);
+ integration::TestTurnCount(route, 4);
integration::GetNthTurn(route, 0)
.TestValid()
- .TestDirection(TurnDirection::UTurnLeft);
+ .TestDirection(TurnDirection::TurnRight);
integration::GetNthTurn(route, 1)
.TestValid()
+ .TestDirection(TurnDirection::UTurnLeft);
+ integration::GetNthTurn(route, 2)
+ .TestValid()
.TestDirection(TurnDirection::TurnRight);
- integration::GetNthTurn(route, 2).TestValid().TestDirection(TurnDirection::TurnLeft);
+ integration::GetNthTurn(route, 3).TestValid().TestDirection(TurnDirection::TurnLeft);
integration::TestRouteLength(route, 2033.);
}