From 6e824691f7519313d0c463ceb0fc8c95799a718f Mon Sep 17 00:00:00 2001
From: Mikhail Gorbushin <m.gorbushin@corp.mail.ru>
Date: Wed, 18 Jul 2018 12:16:09 +0300
Subject: [PATCH] [routing] fix tests

---
 routing/cross_mwm_connector_serialization.hpp    |  8 ++++----
 .../routing_tests/cross_mwm_connector_test.cpp   | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/routing/cross_mwm_connector_serialization.hpp b/routing/cross_mwm_connector_serialization.hpp
index c48b4b7e3f..7728467187 100644
--- a/routing/cross_mwm_connector_serialization.hpp
+++ b/routing/cross_mwm_connector_serialization.hpp
@@ -119,8 +119,8 @@ public:
     void ReadCrossMwmId(uint8_t bits, BitReader<Source> & reader, osm::Id & osmId)
     {
       CHECK_LESS_OR_EQUAL(bits, connector::kOsmIdBits, ());
-      /* We lost data about transition type after compression (look at CalcBitsPerCrossMwmId method),
-       * but we used Way in routing, so suggest, that it is Way */
+      // We lost data about transition type after compression (look at CalcBitsPerCrossMwmId method),
+      // but we used Way in routing, so suggest, that it is Way.
       osmId = osm::Id::Way(reader.ReadAtMost64Bits(bits));
     }
 
@@ -441,8 +441,8 @@ private:
     for (auto const & transition : transitions)
       osmId = std::max(osmId, transition.GetCrossMwmId());
 
-    /* Note, that we lose osm::Id::Type bits here, remember about
-     * it in ReadCrossMwmId method. */
+    // Note, that we lose osm::Id::Type bits here, remember about
+    // it in ReadCrossMwmId method.
     return bits::NumUsedBits(osmId.GetOsmId());
   }
 
diff --git a/routing/routing_tests/cross_mwm_connector_test.cpp b/routing/routing_tests/cross_mwm_connector_test.cpp
index 24b0bca0eb..1cbdb1bcad 100644
--- a/routing/routing_tests/cross_mwm_connector_test.cpp
+++ b/routing/routing_tests/cross_mwm_connector_test.cpp
@@ -242,7 +242,7 @@ void TestSerialization(vector<CrossMwmConnectorSerializer::Transition<CrossMwmId
                       RouteWeight::FromCrossMwmWeight(kEdgesWeight)}});
 }
 
-void GetCrossMwmId(uint32_t i, osm::Id & id) { id = osm::Id(10 * i); }
+void GetCrossMwmId(uint32_t i, osm::Id & id) { id = osm::Id::Way(10 * i); }
 
 void GetCrossMwmId(uint32_t i, TransitId & id)
 {
@@ -331,25 +331,25 @@ namespace routing_test
 {
 UNIT_TEST(OneWayEnter)
 {
-  TestOneWayEnter(osm::Id(1ULL));
+  TestOneWayEnter(osm::Id::Way(1ULL));
   TestOneWayEnter(TransitId(1 /* stop 1 id */, 2 /* stop 2 id */, 1 /* line id */));
 }
 
 UNIT_TEST(OneWayExit)
 {
-  TestOneWayExit(osm::Id(1ULL));
+  TestOneWayExit(osm::Id::Way(1ULL));
   TestOneWayExit(TransitId(1 /* stop 1 id */, 2 /* stop 2 id */, 1 /* line id */));
 }
 
 UNIT_TEST(TwoWayEnter)
 {
-  TestTwoWayEnter(osm::Id(1ULL));
+  TestTwoWayEnter(osm::Id::Way(1ULL));
   TestTwoWayEnter(TransitId(1 /* stop 1 id */, 2 /* stop 2 id */, 1 /* line id */));
 }
 
 UNIT_TEST(TwoWayExit)
 {
-  TestTwoWayExit(osm::Id(1ULL));
+  TestTwoWayExit(osm::Id::Way(1ULL));
   TestTwoWayExit(TransitId(1 /* stop 1 id */, 2 /* stop 2 id */, 1 /* line id */));
 }
 
@@ -358,10 +358,10 @@ UNIT_TEST(Serialization)
   {
     vector<CrossMwmConnectorSerializer::Transition<osm::Id>> const transitions = {
         /* osmId featureId, segmentIdx, roadMask, oneWayMask, forwardIsEnter, backPoint, frontPoint */
-        {osm::Id(100ULL), 10, 1, kCarMask, kCarMask, true, m2::PointD(1.1, 1.2),
+        {osm::Id::Way(100ULL), 10, 1, kCarMask, kCarMask, true, m2::PointD(1.1, 1.2),
          m2::PointD(1.3, 1.4)},
-        {osm::Id(200ULL), 20, 2, kCarMask, 0, true, m2::PointD(2.1, 2.2), m2::PointD(2.3, 2.4)},
-        {osm::Id(300ULL), 30, 3, kPedestrianMask, kCarMask, true, m2::PointD(3.1, 3.2),
+        {osm::Id::Way(200ULL), 20, 2, kCarMask, 0, true, m2::PointD(2.1, 2.2), m2::PointD(2.3, 2.4)},
+        {osm::Id::Way(300ULL), 30, 3, kPedestrianMask, kCarMask, true, m2::PointD(3.1, 3.2),
          m2::PointD(3.3, 3.4)}};
     TestSerialization(transitions);
   }