[search] Fixed numero signs in search queries and names.

1 files changed, 19 insertions, 1 deletions

diff --git a/indexer/indexer_tests/search_string_utils_test.cpp b/indexer/indexer_tests/search_string_utils_test.cpp
index 1e50b480bc..f4a64fc234 100644
--- a/indexer/indexer_tests/search_string_utils_test.cpp
+++ b/indexer/indexer_tests/search_string_utils_test.cpp
@@ -4,9 +4,13 @@
 
 #include "base/string_utils.hpp"
 
-#include "std/vector.hpp"
+#include <cstdint>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace search;
+using namespace std;
 using namespace strings;
 
 namespace
@@ -42,6 +46,11 @@ bool TestStreetPrefixMatch(char const * s)
 {
   return IsStreetSynonymPrefix(MakeUniString(s));
 }
+
+string NormalizeAndSimplifyStringUtf8(string const & s)
+{
+  return strings::ToUtf8(NormalizeAndSimplifyString(s));
+}
 } // namespace
 
 UNIT_TEST(FeatureTypeToString)
@@ -171,3 +180,12 @@ UNIT_TEST(StreetTokensFilter)
     TEST_EQUAL(expected, actual, ());
   }
 }
+
+UNIT_TEST(NormalizeAndSimplifyString_Numero)
+{
+  TEST_EQUAL(NormalizeAndSimplifyStringUtf8("Зона №51"), "зона  51", ());
+  TEST_EQUAL(NormalizeAndSimplifyStringUtf8("Зона № 51"), "зона   51", ());
+  TEST_EQUAL(NormalizeAndSimplifyStringUtf8("Area #51"), "area  51", ());
+  TEST_EQUAL(NormalizeAndSimplifyStringUtf8("Area # "), "area   ", ());
+  TEST_EQUAL(NormalizeAndSimplifyStringUtf8("Area #One"), "area #one", ());
+}