diff options
author | Yuri Gorshenin <y@maps.me> | 2017-06-20 20:27:23 +0300 |
---|---|---|
committer | Yuri Gorshenin <mipt.vi002@gmail.com> | 2017-07-05 16:41:38 +0300 |
commit | 100cc82f2fcb7380fe61af66d14807571187830d (patch) | |
tree | 92c8e41131728577afe9977c9d907a587093b592 /ugc/ugc_tests | |
parent | 880bc83c8a94177f345231c7d9e6c415ed9f6f98 (diff) |
[ugc] Fake UGC are generated in API now.
Diffstat (limited to 'ugc/ugc_tests')
-rw-r--r-- | ugc/ugc_tests/CMakeLists.txt | 2 | ||||
-rw-r--r-- | ugc/ugc_tests/serdes_tests.cpp | 38 |
2 files changed, 4 insertions, 36 deletions
diff --git a/ugc/ugc_tests/CMakeLists.txt b/ugc/ugc_tests/CMakeLists.txt index 6156b432cd..53deb61ab8 100644 --- a/ugc/ugc_tests/CMakeLists.txt +++ b/ugc/ugc_tests/CMakeLists.txt @@ -6,5 +6,5 @@ set( ) omim_add_test(${PROJECT_NAME} ${SRC}) -omim_link_libraries(${PROJECT_NAME} platform coding geometry base) +omim_link_libraries(${PROJECT_NAME} ugc indexer platform coding geometry base) link_qt5_core(${PROJECT_NAME}) diff --git a/ugc/ugc_tests/serdes_tests.cpp b/ugc/ugc_tests/serdes_tests.cpp index a38d0016a6..66638655a3 100644 --- a/ugc/ugc_tests/serdes_tests.cpp +++ b/ugc/ugc_tests/serdes_tests.cpp @@ -1,12 +1,12 @@ #include "testing/testing.hpp" +#include "ugc/api.hpp" #include "ugc/serdes.hpp" #include "ugc/types.hpp" #include "coding/reader.hpp" #include "coding/writer.hpp" -#include <chrono> #include <cstdint> #include <vector> @@ -19,11 +19,6 @@ using Buffer = vector<uint8_t>; using Ser = Serializer<MemWriter<Buffer>>; using Des = DeserializerV0<ReaderSource<MemReader>>; -chrono::hours FromDays(uint32_t days) -{ - return std::chrono::hours(days * 24); -} - Rating GetTestRating() { vector<RatingRecord> records; @@ -33,34 +28,7 @@ Rating GetTestRating() return Rating(records, 4.5 /* aggValue */); } -UGC GetTestUGC() -{ - Rating rating; - rating.m_ratings.emplace_back("food" /* key */, 4.0 /* value */); - rating.m_ratings.emplace_back("service" /* key */, 5.0 /* value */); - rating.m_ratings.emplace_back("music" /* key */, 5.0 /* value */); - rating.m_aggValue = 4.5; - - vector<Review> reviews; - reviews.emplace_back(20 /* id */, Text("Damn good coffee", StringUtf8Multilang::kEnglishCode), - Author(UID(987654321 /* hi */, 123456789 /* lo */), "Cole"), - 5.0 /* rating */, Sentiment::Positive, Time(FromDays(10))); - reviews.emplace_back(67812 /* id */, - Text("Clean place, reasonably priced", StringUtf8Multilang::kDefaultCode), - Author(UID(0 /* hi */, 315 /* lo */), "Cooper"), 5.0 /* rating */, - Sentiment::Positive, Time(FromDays(1))); - - vector<Attribute> attributes; - attributes.emplace_back("best-drink", "Coffee"); - - return UGC(rating, reviews, attributes); -} - -MemWriter<Buffer> MakeSink(Buffer & buffer) -{ - return MemWriter<Buffer>(buffer); -} - +MemWriter<Buffer> MakeSink(Buffer & buffer) { return MemWriter<Buffer>(buffer); } ReaderSource<MemReader> MakeSource(Buffer const & buffer) { MemReader reader(buffer.data(), buffer.size()); @@ -93,7 +61,7 @@ UNIT_TEST(SerDes_Rating) UNIT_TEST(SerDes_UGC) { - auto const expectedUGC = GetTestUGC(); + auto const expectedUGC = Api::MakeTestUGC1(); TEST_EQUAL(expectedUGC, expectedUGC, ()); HeaderV0 header; |