[routing][tests] Updated routing integration tests.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>

routing/routing_integration_tests/bicycle_route_test.cpp

@@ -301,17 +301,6 @@ UNIT_TEST(IgnoreCycleBarrier_WithoutAccess)
                                    mercator::FromLatLon(51.3576973, -2.31416085), 11131.6);
 }
 
-// https://github.com/organicmaps/organicmaps/issues/7257
-UNIT_TEST(AvoidConstruction)
-{
-  // Will not work when the bridge will be finished.
-  TRouteResult const res = CalculateRoute(GetVehicleComponents(VehicleType::Bicycle),
-                                   mercator::FromLatLon(-27.4724942, 153.030171), {0.0, 0.0},
-                                   mercator::FromLatLon(-27.4706626, 153.035428));
-  TEST_EQUAL(res.second, RouterResultCode::NoError, ());
-  TEST_GREATER(res.first->GetTotalDistanceMeters(), 2900, ());
-}
-
 UNIT_TEST(UK_Canterbury_UseDismount)
 {
   CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Pedestrian),

routing/routing_integration_tests/pedestrian_route_test.cpp

@@ -155,7 +155,7 @@ UNIT_TEST(EstoniaTallinnRadissonHiltonToCatherdalChurch)
   integration::CalculateRouteAndTestRouteLength(
       integration::GetVehicleComponents(VehicleType::Pedestrian),
       mercator::FromLatLon(59.4362, 24.7682), {0., 0.},
-      mercator::FromLatLon(59.437, 24.7392), 2016.);
+      mercator::FromLatLon(59.437, 24.7392), 1972.54);
 }
 
 UNIT_TEST(EstoniaTallinnRadissonHiltonToSkypeOffice)
@@ -271,12 +271,14 @@ UNIT_TEST(CzechPragueNode5ToHilton)
       mercator::FromLatLon(50.0933, 14.4397), 5106.);
 }
 
+/// @todo Here maybe some +-100m differencies. OM workd like OSRM here.
+/// @{
 UNIT_TEST(CzechPragueHiltonToKarlovMost)
 {
   integration::CalculateRouteAndTestRouteLength(
       integration::GetVehicleComponents(VehicleType::Pedestrian),
       mercator::FromLatLon(50.0933, 14.4397), {0., 0.},
-      mercator::FromLatLon(50.0864, 14.4124), 2410.07);
+      mercator::FromLatLon(50.0864, 14.4124), 2483);
 }
 
 UNIT_TEST(CzechPragueHiltonToNicholasChurch)
@@ -284,8 +286,9 @@ UNIT_TEST(CzechPragueHiltonToNicholasChurch)
   integration::CalculateRouteAndTestRouteLength(
       integration::GetVehicleComponents(VehicleType::Pedestrian),
       mercator::FromLatLon(50.0933, 14.4397), {0., 0.},
-      mercator::FromLatLon(50.088, 14.4032), 3103.);
+      mercator::FromLatLon(50.088, 14.4032), 3196);
 }
+/// @}
 
 UNIT_TEST(CzechPragueHiltonToKvetniceViewpoint)
 {

routing/routing_integration_tests/route_test.cpp

@@ -857,7 +857,7 @@ UNIT_TEST(Germany_Netherlands_AvoidLoops)
   TEST(routeResult.first, ());
   Route const & route = *routeResult.first;
   TestRouteLength(route, 405058);
-  TestRouteTime(route, 14158);
+  TestRouteTime(route, 13965.2);
 }
 
 UNIT_TEST(Germany_Cologne_Croatia_Zagreb)

search/search_quality/search_quality_tests/real_mwm_tests.cpp

@@ -197,12 +197,13 @@ UNIT_CLASS_TEST(MwmTestsFixture, TopPOIs_Smoke)
     auto const & results = request->Results();
     TEST_GREATER(results.size(), kTopPoiResultsCount, ());
 
-    Range const range(results, 0, 5);
-    EqualClassifType(range, GetClassifTypes({{"shop"}}));
-    TEST_LESS(SortedByDistance(range, center).first, 5000, ());
+    Range const range(results, 0, 6);
+    EqualClassifType(range, GetClassifTypes({{"shop"}, {"highway", "bus_stop"}}));
+    // highway=bus_stop is closer, but has less rank compared to the shop.
+    TEST_LESS(SortedByDistance(Range(results, 0, 3), center).first, 5000, ());
 
     // parking (< 6km) should be on top.
-    EqualClassifType(Range(results, 5, 7), GetClassifTypes({{"leisure", "playground"}, {"amenity", "parking"}}));
+    EqualClassifType(Range(results, 6, 8), GetClassifTypes({{"leisure", "playground"}, {"amenity", "parking"}}));
   }
 
   // https://github.com/organicmaps/organicmaps/issues/2470
@@ -1245,7 +1246,7 @@ UNIT_CLASS_TEST(MwmTestsFixture, Opfikon_Viewport)
     TEST_EQUAL(CountClassifType(allRange, cl.GetTypeByPath({"tourism"})), 2, ());
 
     TEST_EQUAL(CountClassifType(allRange, cl.GetTypeByPath({"highway", "bus_stop"})), 3, ());
-    TEST_EQUAL(CountClassifType(allRange, cl.GetTypeByPath({"leisure"})), 3, ());
+    TEST_EQUAL(CountClassifType(allRange, cl.GetTypeByPath({"leisure"})), 5, ());
 
     TEST_GREATER(CountClassifType(allRange, cl.GetTypeByPath({"highway"})), 8, ());
     TEST_GREATER(CountClassifType(allRange, cl.GetTypeByPath({"amenity"})), 12, ());