Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed test

This commit is contained in:
Jan Steemann 2016-03-01 14:32:19 +01:00
parent d67384db5f
commit acf308f3dc
2 changed files with 39 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
UnitTests/Basics/string-utf8-normalize-test.cpp
View File

@ -168,61 +168,57 @@ BOOST_AUTO_TEST_CASE (tst_3) {
BOOST_AUTO_TEST_CASE (tst_4) {
std::string testString = "Der Müller geht in die Post.";
TRI_vector_string_t* words = arangodb::basics::Utf8Helper::DefaultUtf8Helper.getWords(testString.c_str(), testString.length(), 3, UINT32_MAX, true);
BOOST_CHECK(words != NULL);
std::vector<std::string> words;
arangodb::basics::Utf8Helper::DefaultUtf8Helper.getWords(words, testString, 3, UINT32_MAX, true);
BOOST_CHECK(!words.empty());
BOOST_CHECK_EQUAL(5, (int) words->_length);
BOOST_CHECK_EQUAL("der", words->_buffer[0]);
BOOST_CHECK_EQUAL("müller", words->_buffer[1]);
BOOST_CHECK_EQUAL("geht", words->_buffer[2]);
BOOST_CHECK_EQUAL("die", words->_buffer[3]);
BOOST_CHECK_EQUAL("post", words->_buffer[4]);
BOOST_CHECK_EQUAL(5UL, words.size());
BOOST_CHECK_EQUAL("der", words[0]);
BOOST_CHECK_EQUAL("müller", words[1]);
BOOST_CHECK_EQUAL("geht", words[2]);
BOOST_CHECK_EQUAL("die", words[3]);
BOOST_CHECK_EQUAL("post", words[4]);
TRI_FreeVectorString(TRI_UNKNOWN_MEM_ZONE, words);
words.clear();
arangodb::basics::Utf8Helper::DefaultUtf8Helper.getWords(words, testString, 4, UINT32_MAX, true);
BOOST_CHECK(!words.empty());
BOOST_CHECK_EQUAL(3UL, words.size());
BOOST_CHECK_EQUAL("müller", words[0]);
BOOST_CHECK_EQUAL("geht", words[1]);
BOOST_CHECK_EQUAL("post", words[2]);
words = arangodb::basics::Utf8Helper::DefaultUtf8Helper.getWords(testString.c_str(), testString.length(), 4, UINT32_MAX, true);
BOOST_CHECK(words != NULL);
BOOST_CHECK_EQUAL(3, (int) words->_length);
BOOST_CHECK_EQUAL("müller", words->_buffer[0]);
BOOST_CHECK_EQUAL("geht", words->_buffer[1]);
BOOST_CHECK_EQUAL("post", words->_buffer[2]);
TRI_FreeVectorString(TRI_UNKNOWN_MEM_ZONE, words);
words = arangodb::basics::Utf8Helper::DefaultUtf8Helper.getWords(NULL, 0, 4, UINT32_MAX, true);
BOOST_CHECK(words == NULL);
words.clear();
arangodb::basics::Utf8Helper::DefaultUtf8Helper.getWords(words, "", 3, UINT32_MAX, true);
BOOST_CHECK(words.empty());
}
BOOST_AUTO_TEST_CASE (tst_5) {
std::string testString = "Der Müller geht in die Post.";
TRI_vector_string_t* words = arangodb::basics::Utf8Helper::DefaultUtf8Helper.getWords(testString.c_str(), testString.length(), 3, UINT32_MAX, false);
BOOST_CHECK(words != NULL);
std::vector<std::string> words;
arangodb::basics::Utf8Helper::DefaultUtf8Helper.getWords(words, testString, 3, UINT32_MAX, false);
BOOST_CHECK(!words.empty());
BOOST_CHECK_EQUAL(5, (int) words->_length);
BOOST_CHECK_EQUAL("Der", words->_buffer[0]);
BOOST_CHECK_EQUAL("Müller", words->_buffer[1]);
BOOST_CHECK_EQUAL("geht", words->_buffer[2]);
BOOST_CHECK_EQUAL("die", words->_buffer[3]);
BOOST_CHECK_EQUAL("Post", words->_buffer[4]);
BOOST_CHECK_EQUAL(5UL, words.size());
BOOST_CHECK_EQUAL("Der", words[0]);
BOOST_CHECK_EQUAL("Müller", words[1]);
BOOST_CHECK_EQUAL("geht", words[2]);
BOOST_CHECK_EQUAL("die", words[3]);
BOOST_CHECK_EQUAL("Post", words[4]);
TRI_FreeVectorString(TRI_UNKNOWN_MEM_ZONE, words);
words.clear();
arangodb::basics::Utf8Helper::DefaultUtf8Helper.getWords(words, testString, 4, UINT32_MAX, false);
BOOST_CHECK(!words.empty());
BOOST_CHECK_EQUAL(3UL, words.size());
BOOST_CHECK_EQUAL("Müller", words[0]);
BOOST_CHECK_EQUAL("geht", words[1]);
BOOST_CHECK_EQUAL("Post", words[2]);
words = arangodb::basics::Utf8Helper::DefaultUtf8Helper.getWords(testString.c_str(), testString.length(), 4, UINT32_MAX, false);
BOOST_CHECK(words != NULL);
BOOST_CHECK_EQUAL(3, (int) words->_length);
BOOST_CHECK_EQUAL("Müller", words->_buffer[0]);
BOOST_CHECK_EQUAL("geht", words->_buffer[1]);
BOOST_CHECK_EQUAL("Post", words->_buffer[2]);
TRI_FreeVectorString(TRI_UNKNOWN_MEM_ZONE, words);
words = arangodb::basics::Utf8Helper::DefaultUtf8Helper.getWords(NULL, 0, 4, UINT32_MAX, false);
BOOST_CHECK(words == NULL);
words.clear();
arangodb::basics::Utf8Helper::DefaultUtf8Helper.getWords(words, "", 4, UINT32_MAX, false);
BOOST_CHECK(words.empty());
}
BOOST_AUTO_TEST_SUITE_END ()

2
arangod/Indexes/FulltextIndex.cpp
View File

@ -38,7 +38,7 @@ using namespace arangodb;
/// list.
////////////////////////////////////////////////////////////////////////////////
static bool ExtractWords(std::vector<std::string>& words,
static void ExtractWords(std::vector<std::string>& words,
VPackSlice const value,
size_t minWordLength) {
if (value.isString()) {