Using optionals in ftraits

2 files changed, 12 insertions, 26 deletions

diff --git a/indexer/indexer_tests/ugc_types_test.cpp b/indexer/indexer_tests/ugc_types_test.cpp
index 477e199583..7a2c18a503 100644
--- a/indexer/indexer_tests/ugc_types_test.cpp
+++ b/indexer/indexer_tests/ugc_types_test.cpp
@@ -21,8 +21,7 @@ UNIT_TEST(UgcTypes_Full)
     TEST(!UGC::IsDetailsAvailable(holder), ());
     ftraits::UGCRatingCategories expected = {"quality", "service", "value_for_money"};
     TEST_EQUAL(UGC::GetCategories(holder), expected, ());
-    uint32_t matchingType;
-    TEST(UGC::GetType(holder, matchingType), ());
+    auto const matchingType = *UGC::GetType(holder);
     TEST_EQUAL(matchingType, type, ());
     TEST_EQUAL(c.GetReadableObjectName(matchingType), "amenity-bank", ());
   }
@@ -35,8 +34,7 @@ UNIT_TEST(UgcTypes_Full)
     TEST(!UGC::IsDetailsAvailable(holder), ());
     ftraits::UGCRatingCategories expected = {"quality", "service", "value_for_money"};
     TEST_EQUAL(UGC::GetCategories(holder), expected, ());
-    uint32_t matchingType;
-    TEST(UGC::GetType(holder, matchingType), ());
+    auto const matchingType = *UGC::GetType(holder);
     TEST_EQUAL(matchingType, type, ());
     TEST_EQUAL(c.GetReadableObjectName(matchingType), "tourism-information-office", ());
   }
@@ -49,16 +47,14 @@ UNIT_TEST(UgcTypes_Full)
     TEST(!UGC::IsDetailsAvailable(holder), ());
     ftraits::UGCRatingCategories expected = {"expertise", "equipment", "value_for_money"};
     TEST_EQUAL(UGC::GetCategories(holder), expected, ());
-    uint32_t matchingType;
-    TEST(UGC::GetType(holder, matchingType), ());
+    auto const matchingType = *UGC::GetType(holder);
     TEST_EQUAL(matchingType, type, ());
     TEST_EQUAL(c.GetReadableObjectName(matchingType), "amenity-hospital", ());
   }
   {
     holder.Assign(c.GetTypeByPath({"traffic_calming", "bump"}));
     TEST(!UGC::IsUGCAvailable(holder), ());
-    uint32_t matchingType;
-    TEST(!UGC::GetType(holder, matchingType), ());
+    TEST(!UGC::GetType(holder), ());
   }
   {
     holder.Assign(c.GetTypeByPath({"sponsored", "booking"}));
@@ -68,8 +64,7 @@ UNIT_TEST(UgcTypes_Full)
     TEST(!UGC::IsDetailsAvailable(holder), ());
     ftraits::UGCRatingCategories expected = {};
     TEST_EQUAL(UGC::GetCategories(holder), expected, ());
-    uint32_t matchingType;
-    TEST(!UGC::GetType(holder, matchingType), ());
+    TEST(!UGC::GetType(holder), ());
 
     holder.Assign(c.GetTypeByPath({"sponsored", "booking"}));
     holder.Add(c.GetTypeByPath({"amenity", "hospital"}));
@@ -78,7 +73,7 @@ UNIT_TEST(UgcTypes_Full)
     TEST(!UGC::IsReviewsAvailable(holder), ());
     TEST(!UGC::IsDetailsAvailable(holder), ());
     TEST_EQUAL(UGC::GetCategories(holder), expected, ());
-    TEST(!UGC::GetType(holder, matchingType), ());
+    TEST(!UGC::GetType(holder), ());
 
     holder.Assign(c.GetTypeByPath({"amenity", "hospital"}));
     holder.Add(c.GetTypeByPath({"sponsored", "booking"}));
@@ -87,6 +82,6 @@ UNIT_TEST(UgcTypes_Full)
     TEST(!UGC::IsReviewsAvailable(holder), ());
     TEST(!UGC::IsDetailsAvailable(holder), ());
     TEST_EQUAL(UGC::GetCategories(holder), expected, ());
-    TEST(!UGC::GetType(holder, matchingType), ());
+    TEST(!UGC::GetType(holder), ());
   }
 }
diff --git a/indexer/indexer_tests/wheelchair_tests.cpp b/indexer/indexer_tests/wheelchair_tests.cpp
index b73e1d1db0..008865d846 100644
--- a/indexer/indexer_tests/wheelchair_tests.cpp
+++ b/indexer/indexer_tests/wheelchair_tests.cpp
@@ -15,32 +15,23 @@ UNIT_TEST(Wheelchair_GetType)
   feature::TypesHolder holder;
   {
     holder.Assign(c.GetTypeByPath({"wheelchair", "no"}));
-    WheelchairAvailability a;
-    TEST(Wheelchair::GetValue(holder, a), ());
-    TEST_EQUAL(a, WheelchairAvailability::No, ());
+    TEST_EQUAL(*Wheelchair::GetValue(holder), WheelchairAvailability::No, ());
   }
   {
     holder.Assign(c.GetTypeByPath({"wheelchair", "yes"}));
-    WheelchairAvailability a;
-    TEST(Wheelchair::GetValue(holder, a), ());
-    TEST_EQUAL(a, WheelchairAvailability::Yes, ());
+    TEST_EQUAL(*Wheelchair::GetValue(holder), WheelchairAvailability::Yes, ());
   }
   {
     holder.Assign(c.GetTypeByPath({"wheelchair", "limited"}));
-    WheelchairAvailability a;
-    TEST(Wheelchair::GetValue(holder, a), ());
-    TEST_EQUAL(a, WheelchairAvailability::Limited, ());
+    TEST_EQUAL(*Wheelchair::GetValue(holder), WheelchairAvailability::Limited, ());
   }
   {
     holder.Assign(c.GetTypeByPath({"amenity", "dentist"}));
-    WheelchairAvailability a;
-    TEST(!Wheelchair::GetValue(holder, a), ());
+    TEST(!Wheelchair::GetValue(holder), ());
   }
   {
     holder.Assign(c.GetTypeByPath({"amenity", "dentist"}));
     holder.Add(c.GetTypeByPath({"wheelchair", "yes"}));
-    WheelchairAvailability a;
-    TEST(Wheelchair::GetValue(holder, a), ());
-    TEST_EQUAL(a, WheelchairAvailability::Yes, ());
+    TEST_EQUAL(*Wheelchair::GetValue(holder), WheelchairAvailability::Yes, ());
   }
 }