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

Fixed words_tests: one file handle remains open at deletion moment.

Browse source
This commit is contained in:
Alexander Gusak 2011-08-02 01:10:31 +03:00 • committed by Alex Zolotarev
parent 89e1bec8ea
commit b7a2a89fa2
1 changed files with 31 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
words/words_tests/sorted_index_test.cpp
View file

@ -96,32 +96,37 @@ namespace
UNIT_TEST(SortedIndex_Smoke)
{
string const & filePrefix = "sorted_index_smoke_test";
DictionaryMock dictionary;
SetupDictionary(dictionary);
sl::StrFn strFn = StrFnForTest();
sl::SortedIndex::Build(dictionary, strFn, filePrefix);
sl::SortedIndex idx(dictionary, GetPlatform().GetReader(filePrefix + ".idx"), strFn);
TEST_EQUAL(dictionary.KeyCount(), 5, ());
TEST_EQUAL(KeyByIndexId(idx, 0), "abc", ());
TEST_EQUAL(KeyByIndexId(idx, 1), "He", ());
TEST_EQUAL(KeyByIndexId(idx, 2), "Hello", ());
TEST_EQUAL(KeyByIndexId(idx, 3), "hello", ());
TEST_EQUAL(KeyByIndexId(idx, 4), "World", ());
TEST_EQUAL(ArticleByIndexId(idx, 0), "abc1", ());
TEST_EQUAL(ArticleByIndexId(idx, 1), "He0", ());
TEST_EQUAL(ArticleByIndexId(idx, 2), "Hello0", ());
TEST_EQUAL(ArticleByIndexId(idx, 3), "hello0", ());
TEST_EQUAL(ArticleByIndexId(idx, 4), "World0", ());
TEST_EQUAL(idx.PrefixSearch(""), 0, ());
TEST_EQUAL(idx.PrefixSearch("h"), 1, ());
TEST_EQUAL(idx.PrefixSearch("H"), 1, ());
TEST_EQUAL(idx.PrefixSearch("He"), 1, ());
TEST_EQUAL(idx.PrefixSearch("he"), 1, ());
TEST_EQUAL(idx.PrefixSearch("hea"), 2, ());
TEST_EQUAL(idx.PrefixSearch("hel"), 2, ());
TEST_EQUAL(idx.PrefixSearch("Hello"), 2, ());
TEST_EQUAL(idx.PrefixSearch("W"), 4, ());
TEST_EQUAL(idx.PrefixSearch("zzz"), 5, ());
{
// Local scope to be sure all file handles are closed before deletion
DictionaryMock dictionary;
SetupDictionary(dictionary);
sl::StrFn strFn = StrFnForTest();
sl::SortedIndex::Build(dictionary, strFn, filePrefix);
sl::SortedIndex idx(dictionary, GetPlatform().GetReader(filePrefix + ".idx"), strFn);
TEST_EQUAL(dictionary.KeyCount(), 5, ());
TEST_EQUAL(KeyByIndexId(idx, 0), "abc", ());
TEST_EQUAL(KeyByIndexId(idx, 1), "He", ());
TEST_EQUAL(KeyByIndexId(idx, 2), "Hello", ());
TEST_EQUAL(KeyByIndexId(idx, 3), "hello", ());
TEST_EQUAL(KeyByIndexId(idx, 4), "World", ());
TEST_EQUAL(ArticleByIndexId(idx, 0), "abc1", ());
TEST_EQUAL(ArticleByIndexId(idx, 1), "He0", ());
TEST_EQUAL(ArticleByIndexId(idx, 2), "Hello0", ());
TEST_EQUAL(ArticleByIndexId(idx, 3), "hello0", ());
TEST_EQUAL(ArticleByIndexId(idx, 4), "World0", ());
TEST_EQUAL(idx.PrefixSearch(""), 0, ());
TEST_EQUAL(idx.PrefixSearch("h"), 1, ());
TEST_EQUAL(idx.PrefixSearch("H"), 1, ());
TEST_EQUAL(idx.PrefixSearch("He"), 1, ());
TEST_EQUAL(idx.PrefixSearch("he"), 1, ());
TEST_EQUAL(idx.PrefixSearch("hea"), 2, ());
TEST_EQUAL(idx.PrefixSearch("hel"), 2, ());
TEST_EQUAL(idx.PrefixSearch("Hello"), 2, ());
TEST_EQUAL(idx.PrefixSearch("W"), 4, ());
TEST_EQUAL(idx.PrefixSearch("zzz"), 5, ());
}
FileWriter::DeleteFileX(GetPlatform().WritablePathForFile(filePrefix + ".idx"));
TEST(g_AllocatedStrSet.empty(), ());
}