diff options
author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2019-06-10 09:33:26 +0300 |
---|---|---|
committer | mpimenov <mpimenov@users.noreply.github.com> | 2019-06-11 14:04:41 +0300 |
commit | be760427c86a6202dee140bb6ca5f09b07fff736 (patch) | |
tree | 2589018e4e3dd7d2109ce6c46d4d7870fbad4ad2 /routing | |
parent | 9213224293daab92d34f3b19bbea3c6e7bc5d111 (diff) |
[routing] Fixing routing quality and integration tests after map update to 190517.
Diffstat (limited to 'routing')
3 files changed, 7 insertions, 9 deletions
diff --git a/routing/routing_integration_tests/routing_test_tools.cpp b/routing/routing_integration_tests/routing_test_tools.cpp index a7391f7a60..025ec7ef23 100644 --- a/routing/routing_integration_tests/routing_test_tools.cpp +++ b/routing/routing_integration_tests/routing_test_tools.cpp @@ -18,7 +18,6 @@ #include "indexer/data_source.hpp" #include "storage/country_parent_getter.hpp" -#include "storage/storage.hpp" #include "platform/local_country_file.hpp" #include "platform/local_country_file_utils.hpp" @@ -103,20 +102,19 @@ unique_ptr<IndexRouter> CreateVehicleRouter(DataSource & dataSource, return infoGetter.GetLimitRectForLeaf(countryId); }; - storage::Storage storage; + auto countryParentGetter = std::make_unique<storage::CountryParentGetter>(); + CHECK(countryParentGetter, ()); + auto numMwmIds = make_shared<NumMwmIds>(); for (auto const & f : localFiles) { auto const & countryFile = f.GetCountryFile(); auto const mwmId = dataSource.GetMwmIdByCountryFile(countryFile); CHECK(mwmId.IsAlive(), ()); - if (storage.IsLeaf(countryFile.GetName())) + if (countryParentGetter->GetStorageForTesting().IsLeaf(countryFile.GetName())) numMwmIds->RegisterFile(countryFile); } - auto countryParentGetter = std::make_unique<storage::CountryParentGetter>(); - CHECK(countryParentGetter, ()); - bool const loadAltitudes = vehicleType != VehicleType::Car; auto indexRouter = make_unique<IndexRouter>(vehicleType, loadAltitudes, *countryParentGetter, countryFileGetter, diff --git a/routing/routing_integration_tests/street_names_test.cpp b/routing/routing_integration_tests/street_names_test.cpp index 721267528b..d6a61325a4 100644 --- a/routing/routing_integration_tests/street_names_test.cpp +++ b/routing/routing_integration_tests/street_names_test.cpp @@ -52,11 +52,11 @@ UNIT_TEST(RussiaTulskayaToPaveletskayaStreetNamesTest) MoveRoute(route, ms::LatLon(55.73034, 37.63099)); integration::TestCurrentStreetName(route, "Валовая улица"); - integration::TestNextStreetName(route, ""); + integration::TestNextStreetName(route, "улица Зацепский Вал"); MoveRoute(route, ms::LatLon(55.730912, 37.636191)); - integration::TestCurrentStreetName(route, "Валовая улица"); + integration::TestCurrentStreetName(route, "улица Зацепский Вал"); integration::TestNextStreetName(route, ""); integration::TestRouteLength(route, 3390.); diff --git a/routing/routing_quality/routing_quality_tests/bigger_roads_tests.cpp b/routing/routing_quality/routing_quality_tests/bigger_roads_tests.cpp index df196b22bd..91ef4cc0f7 100644 --- a/routing/routing_quality/routing_quality_tests/bigger_roads_tests.cpp +++ b/routing/routing_quality/routing_quality_tests/bigger_roads_tests.cpp @@ -17,7 +17,7 @@ UNIT_TEST(RoutingQuality_RussiaMoscowTushino) UNIT_TEST(RoutingQuality_TurkeyIzmirArea) { - TEST(CheckCarRoute({38.80146, 26.97696} /* start */, {39.06835, 26.88686} /* finish */, + TEST(CheckCarRoute({38.80146, 26.97696} /* start */, {39.0837, 26.90977} /* finish */, {{{39.08146, 27.11798}}} /* reference track */), ()); } |