Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'search/search_tests/house_detector_tests.cpp')
-rw-r--r--search/search_tests/house_detector_tests.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/search/search_tests/house_detector_tests.cpp b/search/search_tests/house_detector_tests.cpp
index 38677ec996..d8e8a6e100 100644
--- a/search/search_tests/house_detector_tests.cpp
+++ b/search/search_tests/house_detector_tests.cpp
@@ -57,7 +57,7 @@ class CollectStreetIDs
static bool GetKey(string const & name, string & key)
{
TEST(!name.empty(), ());
- search::GetStreetNameAsKey(name, key);
+ key = strings::ToUtf8(search::GetStreetNameAsKey(name));
if (key.empty())
{
@@ -331,19 +331,15 @@ UNIT_TEST(HS_StreetsCompare)
namespace
{
-
string GetStreetKey(string const & name)
{
- string res;
- search::GetStreetNameAsKey(name, res);
- return res;
-}
-
+ return strings::ToUtf8(search::GetStreetNameAsKey(name));
}
+} // namespace
UNIT_TEST(HS_StreetKey)
{
- TEST_EQUAL("крупской", GetStreetKey("улица Крупской"), ());
+ TEST_EQUAL("крупскои", GetStreetKey("улица Крупской"), ());
TEST_EQUAL("уручская", GetStreetKey("Уручская ул."), ());
TEST_EQUAL("газетыправда", GetStreetKey("Пр. Газеты Правда"), ());
TEST_EQUAL("якупалы", GetStreetKey("улица Я. Купалы"), ());