From 0dc4cdc742abf5be4cfc2b040bae8ac8ccefa2cb Mon Sep 17 00:00:00 2001 From: Lev Dragunov Date: Tue, 26 Jan 2016 11:58:16 +0300 Subject: [PATCH] Online routing integration tests fixes for new packed_polygins.bin. --- .../online_cross_tests.cpp | 42 +++++++++++++------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/routing/routing_integration_tests/online_cross_tests.cpp b/routing/routing_integration_tests/online_cross_tests.cpp index 3152433b69..22d02d8537 100644 --- a/routing/routing_integration_tests/online_cross_tests.cpp +++ b/routing/routing_integration_tests/online_cross_tests.cpp @@ -8,18 +8,23 @@ namespace UNIT_TEST(OnlineCrossFetcherSmokeTest) { integration::IRouterComponents & routerComponents = integration::GetOsrmComponents(); - TestOnlineFetcher( - {61.76, 34.45}, {45.07, 38.94}, - {"Russia_Central", "Russia_Central", "Russia_Central", "Russia_Central", "Russia_Central", - "Russia_Central", "Russia_Southern", "Russia_Southern", "Russia_Northwestern", - "Russia_Northwestern", "Russia_Northwestern"}, routerComponents); + TestOnlineFetcher({61.76, 34.45}, {45.07, 38.94}, + {"Russia_Republic of Karelia", "Russia_Leningradskaya Oblast_Southeast", + "Russia_Novgorod Oblast", "Russia_Tver Oblast", "Russia_Moscow Oblast", + "Russia_Moscow", "Russia_Tula Oblast", "Russia_Lipetsk Oblast", + "Russia_Voronezh Oblast", "Russia_Rostov Oblast", "Russia_Krasnodar Krai"}, + routerComponents); } UNIT_TEST(OnlineRussiaNorthToSouthTest) { integration::IRouterComponents & routerComponents = integration::GetOsrmComponents(); TestOnlineCrosses({61.76, 34.45}, {45.07, 38.94}, - {"Russia_Central", "Russia_Southern", "Russia_Northwestern"}, routerComponents); + {"Russia_Republic of Karelia", "Russia_Leningradskaya Oblast_Southeast", + "Russia_Novgorod Oblast", "Russia_Tver Oblast", "Russia_Moscow Oblast", + "Russia_Moscow", "Russia_Tula Oblast", "Russia_Lipetsk Oblast", + "Russia_Voronezh Oblast", "Russia_Rostov Oblast", "Russia_Krasnodar Krai"}, + routerComponents); } UNIT_TEST(OnlineRoadToSeaCenterTest) @@ -31,28 +36,41 @@ UNIT_TEST(OnlineRoadToSeaCenterTest) UNIT_TEST(OnlineEuropeTestNurnbergToMoscow) { integration::IRouterComponents & routerComponents = integration::GetOsrmComponents(); - TestOnlineCrosses({49.45, 11.082}, {55.74, 37.56}, - {"Russia_Central", "Belarus", "Poland", "Germany_Bavaria", "Germany_Saxony"}, routerComponents); + TestOnlineCrosses( + {49.45, 11.082}, {55.74, 37.56}, + {"Germany_Free State of Bavaria_Middle Franconia", + "Germany_Free State of Bavaria_Upper Franconia", "Germany_Saxony_Leipzig", + "Germany_Saxony_Dresden", "Poland_Lower Silesian Voivodeship", + "Poland_Greater Poland Voivodeship", "Poland_Lodz Voivodeship", + "Poland_Masovian Voivodeship", "Poland_Lublin Voivodeship", "Belarus_Brest Region", + "Belarus_Hrodna Region", "Belarus_Minsk Region", "Belarus_Vitebsk Region", + "Russia_Smolensk Oblast", "Russia_Moscow Oblast", "Russia_Moscow"}, + routerComponents); } UNIT_TEST(OnlineAmericanTestOttawaToWashington) { integration::IRouterComponents & routerComponents = integration::GetOsrmComponents(); TestOnlineCrosses({45.38, -75.69}, {38.91, -77.031}, - {"Canada_Ontario", "USA_New York", "USA_Pennsylvania", "USA_Maryland", "USA_District of Columbia"}, routerComponents); + {"Canada_Ontario_Kingston", "US_New York_North", "US_New York_West", + "US_Pennsylvania_Scranton", "US_Pennsylvania_Central", "US_Maryland_Baltimore", + "US_Maryland_and_DC"}, + routerComponents); } UNIT_TEST(OnlineAsiaPhuketToPnompen) { integration::IRouterComponents & routerComponents = integration::GetOsrmComponents(); - TestOnlineCrosses({7.89, 98.30}, {11.56, 104.86}, - {"Thailand", "Cambodia"}, routerComponents); + TestOnlineCrosses({7.90, 98.23}, {11.56, 104.86}, {"Thailand_South", "Cambodia"}, + routerComponents); } UNIT_TEST(OnlineAustraliaCanberraToPerth) { integration::IRouterComponents & routerComponents = integration::GetOsrmComponents(); TestOnlineCrosses({-33.88, 151.13}, {-31.974, 115.88}, - {"Australia"}, routerComponents); + {"Australia_New South Wales", "Australia_Victoria", "Australia_South Australia", + "Australia_Western Australia"}, + routerComponents); } } // namespace