From af8336248b8b684b6555f6a705432e30d3010214 Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Thu, 12 May 2022 19:56:25 +0300 Subject: [PATCH] [routing][tests] Updated integration tests. Signed-off-by: Viktor Govako --- .../bicycle_route_test.cpp | 7 ++++--- routing/routing_integration_tests/route_test.cpp | 13 +++++++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/routing/routing_integration_tests/bicycle_route_test.cpp b/routing/routing_integration_tests/bicycle_route_test.cpp index c950db4edc..dd0df4e877 100644 --- a/routing/routing_integration_tests/bicycle_route_test.cpp +++ b/routing/routing_integration_tests/bicycle_route_test.cpp @@ -64,7 +64,7 @@ UNIT_TEST(NetherlandsAmsterdamBicycleYes) Route const & route = *routeResult.first; RouterResultCode const result = routeResult.second; TEST_EQUAL(result, RouterResultCode::NoError, ()); - TEST_ALMOST_EQUAL_ABS(route.GetTotalTimeSec(), 300.0, 10.0, ()); + TEST_ALMOST_EQUAL_ABS(route.GetTotalTimeSec(), 336.0, 10.0, ()); } // This test on tag cycleway=opposite for a streets which have oneway=yes. @@ -164,10 +164,11 @@ UNIT_TEST(SpainTenerifeVilaflorAdeje) // Two tests on not building route against traffic on road with oneway:bicycle=yes. UNIT_TEST(MunichRoadWithOnewayBicycleYes1) { + /// @todo Should combine TurnSlightLeft, TurnLeft, TurnLeft into UTurnLeft? integration::CalculateRouteAndTestRouteLength( integration::GetVehicleComponents(VehicleType::Bicycle), - mercator::FromLatLon(48.15995, 11.56296), {0.0, 0.0}, - mercator::FromLatLon(48.16027, 11.56306), 296.247 /* expectedRouteMeters */); + mercator::FromLatLon(48.1601673, 11.5630245), {0.0, 0.0}, + mercator::FromLatLon(48.1606349, 11.5631699), 279.515 /* expectedRouteMeters */); } UNIT_TEST(MunichRoadWithOnewayBicycleYes2) diff --git a/routing/routing_integration_tests/route_test.cpp b/routing/routing_integration_tests/route_test.cpp index 568714de49..b542939c0e 100644 --- a/routing/routing_integration_tests/route_test.cpp +++ b/routing/routing_integration_tests/route_test.cpp @@ -281,7 +281,7 @@ using namespace std; CHECK(routeResult.first, ()); Route const & route = *routeResult.first; - integration::TestRouteTime(route, 18256.0); + integration::TestRouteTime(route, 18045.9); } UNIT_TEST(RussiaMoscowLenigradskiy39GeroevPanfilovtsev22TimeTest) @@ -390,7 +390,7 @@ using namespace std; CHECK(routeResult.first, ()); Route const & route = *routeResult.first; - integration::TestRouteTime(route, 6349.9); + integration::TestRouteTime(route, 6210.24); } UNIT_TEST(TolyattiFeatureThatCrossSeveralMwmsTest) @@ -675,4 +675,13 @@ using namespace std; mercator::FromLatLon(45.470764, 36.331289), {0., 0.}, mercator::FromLatLon(45.424964, 36.080336), 55220.2); } + + // https://github.com/organicmaps/organicmaps/issues/2475 + UNIT_TEST(Spain_LinksJunction) + { + integration::CalculateRouteAndTestRouteLength( + integration::GetVehicleComponents(VehicleType::Car), + mercator::FromLatLon(38.8031, 0.0383), {0., 0.}, + mercator::FromLatLon(38.8228, 0.0357), 3479.63); + } } // namespace route_test