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

[sloynik] Minor test refactoring.

Browse source
This commit is contained in:
Yury Melnichek 2012-07-24 01:08:17 +02:00 • committed by Alex Zolotarev
parent 2a5f6bcc14
commit 3d019bb1c8
3 changed files with 29 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
coding/coding_tests/coding_tests.pro
View file

@ -42,4 +42,4 @@ SOURCES += ../../testing/testingmain.cpp \
HEADERS += \
reader_test.hpp \
coder_test.hpp \
compressor_test_utils.hpp \

21
coding/coding_tests/compressor_test_utils.hpp Normal file
View file

@ -0,0 +1,21 @@
#pragma once
#include "../../testing/testing.hpp"
namespace coding
{
inline void TestCompressor(char const * pSrc, size_t srcSize, string & res)
{
res = "<";
res.insert(res.end(), pSrc, pSrc + srcSize);
res.insert(res.end(), '>');
}
inline void TestDecompressor(char const * pSrc, size_t srcSize, char * pDst, size_t dstSize)
{
TEST_GREATER_OR_EQUAL(srcSize, 2, ());
TEST_EQUAL(srcSize - 2, dstSize, ());
TEST_EQUAL(pSrc[0], '<', ());
TEST_EQUAL(pSrc[srcSize-1], '>', ());
memcpy(pDst, pSrc + 1, srcSize - 2);
}
}

27
publisher/publisher_tests/slof_indexer_test.cpp
View file

@ -1,5 +1,8 @@
#include "../../testing/testing.hpp"
#include "../slof_indexer.hpp"
#include "../../coding/coding_tests/compressor_test_utils.hpp"
#include "../../words/slof_dictionary.hpp"
#include "../../words/sloynik_engine.hpp"
#include "../../coding/reader.hpp"
@ -11,22 +14,6 @@
namespace
{
void TestCompressor(char const * pSrc, size_t srcSize, string & res)
{
res = "<";
res.insert(res.end(), pSrc, pSrc + srcSize);
res.insert(res.end(), '>');
}
void TestDecompressor(char const * pSrc, size_t srcSize, char * pDst, size_t dstSize)
{
TEST_GREATER_OR_EQUAL(srcSize, 2, ());
TEST_EQUAL(srcSize - 2, dstSize, ());
TEST_EQUAL(pSrc[0], '<', ());
TEST_EQUAL(pSrc[srcSize-1], '>', ());
memcpy(pDst, pSrc + 1, srcSize - 2);
}
string Key(sl::SlofDictionary const & dic, sl::Dictionary::Id id)
{
string res;
@ -47,10 +34,10 @@ UNIT_TEST(SlofIndexerEmptyTest)
string serializedDictionary;
{
MemWriter<string> writer(serializedDictionary);
sl::SlofIndexer indexer(writer, 20, &TestCompressor);
sl::SlofIndexer indexer(writer, 20, &coding::TestCompressor);
}
sl::SlofDictionary dic(new MemReader(&serializedDictionary[0], serializedDictionary.size()),
&TestDecompressor);
&coding::TestDecompressor);
TEST_EQUAL(dic.KeyCount(), 0, ());
}
@ -59,7 +46,7 @@ UNIT_TEST(SlofIndexerSmokeTest)
string serializedDictionary;
{
MemWriter<string> writer(serializedDictionary);
sl::SlofIndexer indexer(writer, 25, &TestCompressor);
sl::SlofIndexer indexer(writer, 25, &coding::TestCompressor);
uint64_t articleM = indexer.AddArticle("ArticleM");
indexer.AddKey("M", articleM);
uint64_t articleHello = indexer.AddArticle("ArticleHello");
@ -70,7 +57,7 @@ UNIT_TEST(SlofIndexerSmokeTest)
}
{
sl::SlofDictionary dic(new MemReader(&serializedDictionary[0], serializedDictionary.size()),
&TestDecompressor);
&coding::TestDecompressor);
TEST_EQUAL(dic.KeyCount(), 4, ());
TEST_EQUAL(Key(dic, 0), "He", ());
TEST_EQUAL(Key(dic, 1), "Hello", ());