diff options
author | VladiMihaylenko <vxmihaylenko@gmail.com> | 2017-10-20 14:29:26 +0300 |
---|---|---|
committer | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2017-11-09 11:10:09 +0300 |
commit | 8bcc2e1c5885e4348f9727881db7bb697d47dc24 (patch) | |
tree | 6851d00112801cd9f02fac3fc1ca374faa9dec0b /indexer/indexer_tests | |
parent | 9e725b7eb744b1d3f5028a60b5427db2797919f4 (diff) |
Send type from ugc_types.csv
Diffstat (limited to 'indexer/indexer_tests')
-rw-r--r-- | indexer/indexer_tests/ugc_types_test.cpp | 27 | ||||
-rw-r--r-- | indexer/indexer_tests/wheelchair_tests.cpp | 19 |
2 files changed, 38 insertions, 8 deletions
diff --git a/indexer/indexer_tests/ugc_types_test.cpp b/indexer/indexer_tests/ugc_types_test.cpp index 12e7492809..477e199583 100644 --- a/indexer/indexer_tests/ugc_types_test.cpp +++ b/indexer/indexer_tests/ugc_types_test.cpp @@ -13,35 +13,52 @@ UNIT_TEST(UgcTypes_Full) feature::TypesHolder holder; { - holder.Assign(c.GetTypeByPath({"amenity", "bank"})); + auto const type = c.GetTypeByPath({"amenity", "bank"}); + holder.Assign(type); TEST(UGC::IsUGCAvailable(holder), ()); TEST(UGC::IsRatingAvailable(holder), ()); TEST(UGC::IsReviewsAvailable(holder), ()); 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), ()); + TEST_EQUAL(matchingType, type, ()); + TEST_EQUAL(c.GetReadableObjectName(matchingType), "amenity-bank", ()); } { - holder.Assign(c.GetTypeByPath({"tourism", "information", "office"})); + auto const type = c.GetTypeByPath({"tourism", "information", "office"}); + holder.Assign(type); TEST(UGC::IsUGCAvailable(holder), ()); TEST(UGC::IsRatingAvailable(holder), ()); TEST(UGC::IsReviewsAvailable(holder), ()); 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), ()); + TEST_EQUAL(matchingType, type, ()); + TEST_EQUAL(c.GetReadableObjectName(matchingType), "tourism-information-office", ()); } { - holder.Assign(c.GetTypeByPath({"amenity", "hospital"})); + auto const type = c.GetTypeByPath({"amenity", "hospital"}); + holder.Assign(type); TEST(UGC::IsUGCAvailable(holder), ()); TEST(UGC::IsRatingAvailable(holder), ()); TEST(UGC::IsReviewsAvailable(holder), ()); 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), ()); + 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), ()); } { holder.Assign(c.GetTypeByPath({"sponsored", "booking"})); @@ -51,6 +68,8 @@ 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), ()); holder.Assign(c.GetTypeByPath({"sponsored", "booking"})); holder.Add(c.GetTypeByPath({"amenity", "hospital"})); @@ -59,6 +78,7 @@ UNIT_TEST(UgcTypes_Full) TEST(!UGC::IsReviewsAvailable(holder), ()); TEST(!UGC::IsDetailsAvailable(holder), ()); TEST_EQUAL(UGC::GetCategories(holder), expected, ()); + TEST(!UGC::GetType(holder, matchingType), ()); holder.Assign(c.GetTypeByPath({"amenity", "hospital"})); holder.Add(c.GetTypeByPath({"sponsored", "booking"})); @@ -67,5 +87,6 @@ UNIT_TEST(UgcTypes_Full) TEST(!UGC::IsReviewsAvailable(holder), ()); TEST(!UGC::IsDetailsAvailable(holder), ()); TEST_EQUAL(UGC::GetCategories(holder), expected, ()); + TEST(!UGC::GetType(holder, matchingType), ()); } } diff --git a/indexer/indexer_tests/wheelchair_tests.cpp b/indexer/indexer_tests/wheelchair_tests.cpp index 921f9452dd..b73e1d1db0 100644 --- a/indexer/indexer_tests/wheelchair_tests.cpp +++ b/indexer/indexer_tests/wheelchair_tests.cpp @@ -15,23 +15,32 @@ UNIT_TEST(Wheelchair_GetType) feature::TypesHolder holder; { holder.Assign(c.GetTypeByPath({"wheelchair", "no"})); - TEST_EQUAL(Wheelchair::GetValue(holder), WheelchairAvailability::No, ()); + WheelchairAvailability a; + TEST(Wheelchair::GetValue(holder, a), ()); + TEST_EQUAL(a, WheelchairAvailability::No, ()); } { holder.Assign(c.GetTypeByPath({"wheelchair", "yes"})); - TEST_EQUAL(Wheelchair::GetValue(holder), WheelchairAvailability::Yes, ()); + WheelchairAvailability a; + TEST(Wheelchair::GetValue(holder, a), ()); + TEST_EQUAL(a, WheelchairAvailability::Yes, ()); } { holder.Assign(c.GetTypeByPath({"wheelchair", "limited"})); - TEST_EQUAL(Wheelchair::GetValue(holder), WheelchairAvailability::Limited, ()); + WheelchairAvailability a; + TEST(Wheelchair::GetValue(holder, a), ()); + TEST_EQUAL(a, WheelchairAvailability::Limited, ()); } { holder.Assign(c.GetTypeByPath({"amenity", "dentist"})); - TEST_EQUAL(Wheelchair::GetValue(holder), WheelchairAvailability::No, ()); + WheelchairAvailability a; + TEST(!Wheelchair::GetValue(holder, a), ()); } { holder.Assign(c.GetTypeByPath({"amenity", "dentist"})); holder.Add(c.GetTypeByPath({"wheelchair", "yes"})); - TEST_EQUAL(Wheelchair::GetValue(holder), WheelchairAvailability::Yes, ()); + WheelchairAvailability a; + TEST(Wheelchair::GetValue(holder, a), ()); + TEST_EQUAL(a, WheelchairAvailability::Yes, ()); } } |