gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[search] Fixed tests according to “и-й” logic.

Browse source
This commit is contained in:
vng 2015-06-11 15:50:10 +03:00 • committed by Alex Zolotarev
parent eb1b15ba2b
commit 221191ce03
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
indexer/indexer_tests/search_string_utils_test.cpp
View file

@ -10,12 +10,24 @@ UNIT_TEST(FeatureTypeToString)
UNIT_TEST(NormalizeAndSimplifyStringWithOurTambourines)
{
// This test is dependent from strings::NormalizeAndSimplifyString implementation.
// TODO: Fix it when logic with и-й will change.
/*
string const arr[] = {"ÜbërÅłłęšß", "uberallesss", // Basic test case.
"Iiİı", "iiii", // Famous turkish "I" letter bug.
"ЙЁйёШКИЙй", "йейешкийй", // Better handling of Russian й letter.
"ØøÆ挜", "ooaeaeoeoe",
"バス", "ハス"
};
*/
string const arr[] = {"ÜbërÅłłęšß", "uberallesss", // Basic test case.
"Iiİı", "iiii", // Famous turkish "I" letter bug.
"ЙЁйёШКИЙй", "иеиешкиии", // Better handling of Russian й letter.
"ØøÆ挜", "ooaeaeoeoe",
"バス", "ハス"
};
for (size_t i = 0; i < ARRAY_SIZE(arr); i += 2)
TEST_EQUAL(arr[i + 1], strings::ToUtf8(search::NormalizeAndSimplifyString(arr[i])), (i));
}

1
indexer/search_string_utils.hpp
View file

@ -44,6 +44,7 @@ inline strings::UniString NormalizeAndSimplifyString(string const & s)
NormalizeInplace(uniString);
return uniString;
/// @todo Restore this logic to distinguish и-й in future.
/*
// Just after lower casing is a correct place to avoid normalization for specific chars.
static auto const isSpecificChar = [](UniChar c) -> bool