From c15be91b207bbf97033a3750817d6cc5bf63b28d Mon Sep 17 00:00:00 2001 From: Daria Volvenkova Date: Mon, 26 Nov 2018 17:16:27 +0300 Subject: [PATCH] [descriptions] Descriptions tests added. --- .../descriptions_tests/descriptions_tests.cpp | 254 +++++++++++++++--- descriptions/serdes.cpp | 6 + descriptions/serdes.hpp | 4 +- 3 files changed, 233 insertions(+), 31 deletions(-) diff --git a/descriptions/descriptions_tests/descriptions_tests.cpp b/descriptions/descriptions_tests/descriptions_tests.cpp index e37592b6cc..076d5d93b4 100644 --- a/descriptions/descriptions_tests/descriptions_tests.cpp +++ b/descriptions/descriptions_tests/descriptions_tests.cpp @@ -5,6 +5,7 @@ #include "coding/reader.hpp" #include "coding/writer.hpp" +#include #include #include #include @@ -12,9 +13,33 @@ using namespace descriptions; +using RawDescriptionsCollection = std::map>; + +template +std::string GetDescription(Reader & reader, FeatureIndex fid, std::vector const & langPriority) +{ + Deserializer des; + std::string description; + des.Deserialize(reader, fid, langPriority, description); + return description; +} + +DescriptionsCollection Convert(RawDescriptionsCollection const & rawDescriptionsCollection) +{ + DescriptionsCollection descriptionsCollection; + for (auto const & featureDesc : rawDescriptionsCollection) + { + StringUtf8Multilang str; + for (auto const & translation : featureDesc.second) + str.AddString(translation.first, translation.second); + descriptionsCollection.emplace_back(featureDesc.first, std::move(str)); + } + return descriptionsCollection; +} + UNIT_TEST(Descriptions_SerDes) { - std::map> data = + RawDescriptionsCollection const data = { {100, {{10, "Description of feature 100, language 10."}, {11, "Описание фичи 100, язык 11."}}}, {101, {{11, "Описание фичи 101, язык 11."}}}, @@ -22,40 +47,209 @@ UNIT_TEST(Descriptions_SerDes) {10, "Description of feature 102, language 10."}}} }; - DescriptionsCollection descriptionsCollection; - for (auto const & featureDesc : data) + auto testData = [](MemReader & reader) { - StringUtf8Multilang str; - for (auto const & translation : featureDesc.second) - str.AddString(translation.first, translation.second); - descriptionsCollection.emplace_back(featureDesc.first, std::move(str)); - } + TEST_EQUAL(GetDescription(reader, 102, {11, 10}), "Описание фичи 102, язык 11.", ()); + TEST_EQUAL(GetDescription(reader, 100, {12, 10}), "Description of feature 100, language 10.", ()); + TEST_EQUAL(GetDescription(reader, 101, {12}), "", ()); + TEST_EQUAL(GetDescription(reader, 0, {10, 11}), "", ()); + TEST_EQUAL(GetDescription(reader, 102, {10}), "Description of feature 102, language 10.", ()); + }; - std::vector buffer; { - Serializer ser(std::move(descriptionsCollection)); - MemWriter writer(buffer); - ser.Serialize(writer); - } + std::vector buffer; + { + auto descriptionsCollection = Convert(data); + Serializer ser(std::move(descriptionsCollection)); + MemWriter writer(buffer); + ser.Serialize(writer); + } - std::string description1; - std::string description2; - std::string description3; - std::string description4; - std::string description5; - { - Deserializer des; MemReader reader(buffer.data(), buffer.size()); - des.Deserialize(reader, 102, {11, 10}, description1); - des.Deserialize(reader, 100, {12, 10}, description2); - des.Deserialize(reader, 101, {12}, description3); - des.Deserialize(reader, 0, {10, 11}, description4); - des.Deserialize(reader, 102, {10}, description5); + + testData(reader); } - TEST_EQUAL(description1, "Описание фичи 102, язык 11.", ()); - TEST_EQUAL(description2, "Description of feature 100, language 10.", ()); - TEST_EQUAL(description3, "", ()); - TEST_EQUAL(description4, "", ()); - TEST_EQUAL(description5, "Description of feature 102, language 10.", ()); + { + size_t const kDummyBytesCount = 100; + std::vector buffer(kDummyBytesCount); + { + auto descriptionsCollection = Convert(data); + Serializer ser(std::move(descriptionsCollection)); + MemWriter writer(buffer); + writer.Seek(kDummyBytesCount); + ser.Serialize(writer); + + std::vector buffer2(kDummyBytesCount); + writer.Write(buffer2.data(), buffer2.size()); + } + + MemReader reader(buffer.data(), buffer.size()); + auto subReader = reader.SubReader(kDummyBytesCount, buffer.size() - kDummyBytesCount); + + testData(subReader); + } +} + +UNIT_TEST(Descriptions_Html) +{ + RawDescriptionsCollection const data = + { {100, {{1, "
\n" + "

Map data © " + "OpenStreetMap contributors, ODbL.

\n" + "
"}, + {2, "
\n" + "

Картографические данные © участники " + "OpenStreetMap, ODbL.

\n" + "
"}, + {3, "
\n" + "

Dữ liệu bản đồ © Cộng tác viên của " + "OpenStreetMap, ODbL.

\n" + "
"}, + {4, "
\n" + "

Harita verileri © " + "OpenStreetMap katkıları, ODbL.

\n" + "
"}, + {5, "
\n" + "

ข้อมูลแผนที่ © ผู้มีส่วนร่วม " + "OpenStreetMap ODbL.

\n" + "
"}, + {6, "
\n" + "

Map data © " + "OpenStreetMap-bidragsgivare, ODbL.

\n" + "
"}, + {7, "
\n" + "

Contribuidores de los datos de mapas ©" + " OpenStreetMap, Licencia ODbL.

\n" + "
"}, + {8, "
\n" + "

Dados de mapas de contribuintes do ©" + " OpenStreetMap, ODbL.

\n" + "
"}, + {9, "
\n" + "

Dane map © Współautorzy" + " OpenStreetMap, ODbL.

\n" + "
"}, + {10, "
\n" + "

Kartdata © " + "OpenStreetMap bidragsytere, ODbL.

\n" + "
"}, + {11, "
\n" + "

지도 데이터 © " + "OpenStreetMap contributors, ODbL.

\n" + "
"}, + {12, "
\n" + "

地図データ © " + "OpenStreetMap貢献者、ODbL。

\n" + "
"}, + {13, "
\n" + "

Dati delle mappe © Contenuti " + "OpenStreetMap, ODbL.

\n" + "
"}, + {14, "
\n" + "

Data Peta © Kontributor " + "OpenStreetMap, ODbL.

\n" + "
"}, + {15, "
\n" + "

Térképadat © az " + "OpenStreetMap közreműködői, ODbL.

\n" + "
"}, + {16, "
\n" + "

Kartendaten © " + "OpenStreetMap-Mitwirkende ODbL.

\n" + "
"}, + {17, "
\n" + "

Données de la carte sous © des contributeurs d'" + "OpenStreetMap, licence ODbL.

\n" + "
"}, + {18, "
\n" + "

Karttatiedot © " + "OpenStreetMap-avustajat, ODbL.

\n" + "
"}, + {19, "
\n" + "

Kaartgegevens © " + "OpenStreetMap bjdragers, ODbL.

\n" + "
"}, + {20, "
\n" + "

Mapová data © " + "OpenStreetMap přispěvatelé, ODbL.

\n" + "
"}, + {21, "
\n" + "

地图数据 © " + "OpenStreetMap 贡献者, ODbL.

\n" + "
"}, + {22, "
\n" + "

地圖數據 © " + "OpenStreetMap 貢獻者, ODbL.

\n" + "
"}, + {23, "
\n" + "

المساهمون في بيانات خريطة © " + "OpenStreetMap و ODbL.

\n" + "
"}, + {24, "
\n" + "

Картографічні дані © учасники " + "OpenStreetMap, ODbL.

" + "
"}}}, + {101, {{1, "

maps.me would not be possible without the generous contributions of " + "the following projects:

\n"}, + {2, "

Приложение maps.me было бы невозможно без участия следующих" + " проектов:

\n"}, + {3, "

maps.me sẽ không thành hiện thực nếu không có sự đóng góp hào phóng" + " từ các dự án sau:

\n"}, + {4, "

maps.me, aşağıdaki projelerin cömert katkıları olmadan mümkün " + "olmazdı:

\n"}, + {5, "

maps.me จะสำเร็จลุล่วงไม่ได้เลยหากปราศจากความเอื้อเฟื้อเพื่อการร่วมมือของโป" + "รเจกต์ดังต่อไปนี้:

\n"}, + {6, "

maps.me skulle inte vara möjlig utan följande projekts generösa" + " bidrag:

\n"}, + {7, "

maps.me no sería posible sin las generosas aportaciones de los" + " siguientes proyectos:

\n"}, + {8, "

O maps.me não seria possível sem as contribuições generosas dos " + "seguintes projetos:

\n"}, + {9, "

Aplikacja maps.me nie powstałaby bez znaczącego wkładu ze strony " + "twórców poniższych projektów:

\n"}, + {10, "

maps.me ville ikke vært mulig uten de generøse bidragene fra " + "følgende prosjekter:

\n"}, + {11, "

maps.me는 다음 프로젝트의 아낌없는 기부없이 가능하지 않습니다:

\n"}, + {12, "

maps.meは次のプロジェクトの手厚い貢献なしには不可能です：

\n"}, + {13, "

maps.me non sarebbe realizzabile senza il generoso contributo " + "dei seguenti progetti:

\n"}, + {14, "

maps.me tidak mungkin tercipta tanpa kontribusi yang tulus dari " + "proyek-proyek berikut ini:

\n"}, + {15, "

A maps.me nem jöhetett volna létre az alábbi projektek nagylelkű " + "közreműködése nélkül:

\n"}, + {16, "

maps.me wäre ohne die großzügigen Spenden der folgenden Projekte " + "nicht möglich:

\n"}, + {17, "

L'existence de maps.me serait impossible sans les généreuses " + "contributions des projets suivants :

\n"}, + {18, "

maps.me ei olisi mahdollinen ilman seuraavien projektien aulista " + "tukea:

\n"}, + {19, "

maps.me zou niet mogelijk zijn zonder de genereuze bijdragen voor " + "de volgende projecten:

\n"}, + {20, "

maps.me by nemohlo existovat bez štědrých přispění následujících " + "projektů:

\n"}, + {21, "

沒有下面項目的慷慨貢獻，maps.me 不可能出現：

\n"}, + {22, "

沒有下面項目的慷慨貢獻，maps.me 不可能出現：

\n"}, + {23, "

ما كان لـ maps.me" + " أن تأتي للوجود بدون المساهمات العظيمة للمشاريع التالية:

"}, + {24, "

maps.me був би неможливим без щедрої участі таких проектів:

"}}}, + }; + + { + std::vector buffer; + { + auto descriptionsCollection = Convert(data); + Serializer ser(std::move(descriptionsCollection)); + MemWriter writer(buffer); + ser.Serialize(writer); + } + + MemReader reader(buffer.data(), buffer.size()); + + for (auto const & featureDesc : data) + { + for (auto const & translation : featureDesc.second) + TEST_EQUAL(GetDescription(reader, featureDesc.first, {translation.first}), translation.second, ()); + } + } } diff --git a/descriptions/serdes.cpp b/descriptions/serdes.cpp index 75da40dc8b..e5d6fbfd1d 100644 --- a/descriptions/serdes.cpp +++ b/descriptions/serdes.cpp @@ -7,6 +7,8 @@ namespace descriptions Serializer::Serializer(DescriptionsCollection && descriptions) : m_descriptions(std::move(descriptions)) { + CHECK(!m_descriptions.empty(), ()); + std::sort(m_descriptions.begin(), m_descriptions.end(), base::LessBy(&FeatureDescription::m_featureIndex)); m_langMetaCollection.reserve(m_descriptions.size()); @@ -16,10 +18,14 @@ Serializer::Serializer(DescriptionsCollection && descriptions) for (size_t i = 0; i < m_descriptions.size(); ++i) { auto & index = m_descriptions[i]; + CHECK(!index.m_description.IsEmpty(), ()); LangMeta langMeta; index.m_description.ForEach([this, &stringsCount, &langMeta, i](LangCode lang, std::string const & str) { + CHECK_GREATER_OR_EQUAL(lang, 0, ()); + CHECK(lang < StringUtf8Multilang::kMaxSupportedLanguages, ()); + CHECK(!str.empty(), ()); ++stringsCount; auto & group = m_groupedByLang[lang]; langMeta.insert(std::make_pair(lang, static_cast(group.size()))); diff --git a/descriptions/serdes.hpp b/descriptions/serdes.hpp index 8c072a09e4..e05e38e713 100644 --- a/descriptions/serdes.hpp +++ b/descriptions/serdes.hpp @@ -52,6 +52,7 @@ using DescriptionsCollection = std::vector; /// Section name: "descriptions". /// Description: keeping text descriptions of features in different languages. /// Section tables: +/// * version /// * header /// * sorted feature ids vector /// * vector of unordered maps with language codes and string indices of corresponding translations of a description @@ -60,7 +61,8 @@ using DescriptionsCollection = std::vector; class Serializer { public: - /// \param descriptions unsorted collection of feature descriptions. + /// \param descriptions A non-empty unsorted collection of feature descriptions. + /// FeatureDescription::m_description must contain non-empty translations. explicit Serializer(DescriptionsCollection && descriptions); template