From e64a9820659eec1249bc73648c0dfe0610217d81 Mon Sep 17 00:00:00 2001 From: vng Date: Tue, 19 Aug 2014 16:40:33 +0300 Subject: [PATCH] Minor test changes. --- base/base_tests/string_utils_test.cpp | 14 ++++++++++---- search/search_string_intersection.hpp | 3 +-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/base/base_tests/string_utils_test.cpp b/base/base_tests/string_utils_test.cpp index 97d9b65362..6bc2eed622 100644 --- a/base/base_tests/string_utils_test.cpp +++ b/base/base_tests/string_utils_test.cpp @@ -335,7 +335,6 @@ UNIT_TEST(LastUniChar) TEST_EQUAL(strings::LastUniChar(""), 0, ()); TEST_EQUAL(strings::LastUniChar("Hello"), 0x6f, ()); TEST_EQUAL(strings::LastUniChar(" \xD0\x90"), 0x0410, ()); - } UNIT_TEST(GetUniString) @@ -372,10 +371,17 @@ UNIT_TEST(Normalize) TEST_EQUAL(us, result, ()); } -UNIT_TEST(Normalize_Polish) +UNIT_TEST(Normalize_Special) { - string const utf8 = "ąĄćłŁÓŻźŃĘęĆ"; - TEST_EQUAL(strings::ToUtf8(strings::Normalize(strings::MakeUniString(utf8))), "aAclLOZzNEeC", ()); + { + string const utf8 = "ąĄćłŁÓŻźŃĘęĆ"; + TEST_EQUAL(strings::ToUtf8(strings::Normalize(strings::MakeUniString(utf8))), "aAclLOZzNEeC", ()); + } + + { + string const utf8 = "əüöğ"; + TEST_EQUAL(strings::ToUtf8(strings::Normalize(strings::MakeUniString(utf8))), "əuog", ()); + } } UNIT_TEST(UniStringToUtf8) diff --git a/search/search_string_intersection.hpp b/search/search_string_intersection.hpp index b09152d191..80d1add91f 100644 --- a/search/search_string_intersection.hpp +++ b/search/search_string_intersection.hpp @@ -1,8 +1,7 @@ #pragma once #include "../indexer/search_delimiters.hpp" -#include "../base/buffer_vector.hpp" -#include "../std/algorithm.hpp" + namespace search {