review fixes

2 files changed, 6 insertions, 16 deletions

diff --git a/indexer/indexer_tests/checker_test.cpp b/indexer/indexer_tests/checker_test.cpp
index 703ed22ad0..c08e550817 100644
--- a/indexer/indexer_tests/checker_test.cpp
+++ b/indexer/indexer_tests/checker_test.cpp
@@ -148,14 +148,14 @@ UNIT_TEST(GetHighwayClassTest)
   Classificator const & c = classif();
 
   feature::TypesHolder types1;
-  types1(c.GetTypeByPath({"highway", "motorway_link", "tunnel"}));
+  types1.Add(c.GetTypeByPath({"highway", "motorway_link", "tunnel"}));
   TEST_EQUAL(ftypes::GetHighwayClass(types1), ftypes::HighwayClass::Trunk, ());
 
   feature::TypesHolder types2;
-  types2(c.GetTypeByPath({"highway", "unclassified"}));
+  types2.Add(c.GetTypeByPath({"highway", "unclassified"}));
   TEST_EQUAL(ftypes::GetHighwayClass(types2), ftypes::HighwayClass::LivingStreet, ());
 
   feature::TypesHolder types3;
-  types3(c.GetTypeByPath({"highway"}));
+  types3.Add(c.GetTypeByPath({"highway"}));
   TEST_EQUAL(ftypes::GetHighwayClass(types3), ftypes::HighwayClass::Error, ());
 }
diff --git a/indexer/indexer_tests/editable_map_object_test.cpp b/indexer/indexer_tests/editable_map_object_test.cpp
index 40a455f1c6..f8b4aebbd6 100644
--- a/indexer/indexer_tests/editable_map_object_test.cpp
+++ b/indexer/indexer_tests/editable_map_object_test.cpp
@@ -244,14 +244,7 @@ UNIT_TEST(EditableMapObject_GetNamesDataSource)
 
 UNIT_TEST(EditableMapObject_SetInternet)
 {
-  try
-  {
-    classificator::Load();
-  }
-  catch (RootException const & e)
-  {
-    LOG(LERROR, ("Classificator read error: ", e.what()));
-  }
+  classificator::Load();
 
   EditableMapObject emo;
   auto const wifiType = classif().GetTypeByPath({"internet_access", "wlan"});
@@ -260,13 +253,13 @@ UNIT_TEST(EditableMapObject_SetInternet)
   auto types = emo.GetTypes();
   TEST(types.Has(wifiType), ());
 
-  auto const setInternetAndCheck = [wifiType](EditableMapObject & emo, osm::Internet internet, bool wifiExpected)
+  auto const setInternetAndCheck = [wifiType](EditableMapObject & emo, osm::Internet internet, bool hasWifi)
   {
     emo.SetInternet(internet);
 
     TEST_EQUAL(emo.GetInternet(), internet, ());
     auto const & types = emo.GetTypes();
-    TEST_EQUAL(types.Has(wifiType), wifiExpected, ());
+    TEST_EQUAL(types.Has(wifiType), hasWifi, ());
   };
 
   setInternetAndCheck(emo, osm::Internet::No, false);
@@ -274,9 +267,6 @@ UNIT_TEST(EditableMapObject_SetInternet)
   setInternetAndCheck(emo, osm::Internet::Wired, false);
   setInternetAndCheck(emo, osm::Internet::Wlan, true);
   setInternetAndCheck(emo, osm::Internet::Unknown, false);
-  setInternetAndCheck(emo, osm::Internet::No, false);
-  setInternetAndCheck(emo, osm::Internet::Wlan, true);
-
 
   EditableMapObject bunkerEmo;
   bunkerEmo.SetType(classif().GetTypeByPath({"military", "bunker"}));