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

Fix unit tests, broken during Reader refactoring.

Browse source
This commit is contained in:
Yury Melnichek 2011-07-24 14:25:22 +02:00 • committed by Alex Zolotarev
parent 8118d8e226
commit 968d0b2b29
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
search/search_tests/categories_test.cpp
View file

@ -75,8 +75,7 @@ UNIT_TEST(LoadCategories)
p.GetReader("visibility.txt"));
search::CategoriesHolder h;
string buffer;
ReaderPtr<Reader>(p.GetReader(TEST_STRING)).ReadAsString(buffer);
string buffer = TEST_STRING;
TEST_GREATER(h.LoadFromStream(buffer), 0, ());
size_t count = 0;
Checker f(count);

7
words/words_tests/sorted_index_test.cpp
View file

@ -1,6 +1,8 @@
#include "../../testing/testing.hpp"
#include "../sloynik_index.hpp"
#include "dictionary_mock.hpp"
#include "../../platform/platform.hpp"
#include "../../coding/file_writer.hpp"
#include "../../std/algorithm.hpp"
#include "../../std/bind.hpp"
#include "../../std/map.hpp"
@ -98,7 +100,7 @@ UNIT_TEST(SortedIndex_Smoke)
SetupDictionary(dictionary);
sl::StrFn strFn = StrFnForTest();
sl::SortedIndex::Build(dictionary, strFn, filePrefix);
sl::SortedIndex idx(dictionary, new FileReader(filePrefix + ".idx"), strFn);
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", ());
@ -120,7 +122,6 @@ UNIT_TEST(SortedIndex_Smoke)
TEST_EQUAL(idx.PrefixSearch("Hello"), 2, ());
TEST_EQUAL(idx.PrefixSearch("W"), 4, ());
TEST_EQUAL(idx.PrefixSearch("zzz"), 5, ());
remove((filePrefix + ".idx").c_str());
remove((filePrefix + ".idx").c_str());
FileWriter::DeleteFileX(GetPlatform().WritablePathForFile(filePrefix + ".idx"));
TEST(g_AllocatedStrSet.empty(), ());
}