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

[eye] review fix + test

Browse source
This commit is contained in:
Arsentiy Milchakov 2019-06-24 15:03:02 +03:00 • committed by Tatiana Yan
parent 0efa8e3c43
commit 35beab7045
2 changed files with 103 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
metrics/eye_info.hpp
View file

@ -65,7 +65,7 @@ public:
std::vector<R> loader;
visitor(loader, "counters");
CHECK_LESS_OR_EQUAL(loader.size(), m_counters.size(), ());
std::copy_n(loader.cbegin(), m_counters.size(), m_counters.begin());
std::copy(loader.cbegin(), loader.cend(), m_counters.begin());
}
template <typename Visitor>

102
metrics/metrics_tests/eye_tests.cpp
View file

@ -7,6 +7,11 @@
#include "metrics/metrics_tests_support/eye_for_testing.hpp"
#include "coding/reader.hpp"
#include "coding/serdes_json.hpp"
#include "coding/write_to_sink.hpp"
#include "coding/writer.hpp"
#include <chrono>
#include <cstdint>
#include <utility>
@ -698,3 +703,100 @@ UNIT_CLASS_TEST(ScopedEyeForTesting, RegisterMapObjectEvent)
}
}
}
namespace
{
enum class First : uint8_t
{
One,
Two,
Count
};
enum class Second : uint8_t
{
One,
Two,
Three,
Four,
Count
};
std::string DebugPrint(First first)
{
switch (first)
{
case First::One: return "One";
case First::Two: return "Two";
case First::Count: return "Count";
}
}
std::string DebugPrint(Second second)
{
switch (second)
{
case Second::One: return "One";
case Second::Two: return "Two";
case Second::Three: return "Three";
case Second::Four: return "Four";
case Second::Count: return "Count";
}
}
} // namespace
UNIT_TEST(EyeInfo_CountersSerdes)
{
std::vector<int8_t> data;
eye::Counters<First, uint32_t> counters;
counters.Increment(First::One);
counters.Increment(First::Two);
TEST_EQUAL(counters.Get(First::One), 1, ());
TEST_EQUAL(counters.Get(First::Two), 1, ());
{
using Sink = MemWriter<std::vector<int8_t>>;
Sink writer(data);
coding::SerializerJson<Sink> ser(writer);
ser(counters);
}
{
eye::Counters<First, uint32_t> result;
TEST_EQUAL(result.Get(First::One), 0, ());
TEST_EQUAL(result.Get(First::Two), 0, ());
MemReader reader(data.data(), data.size());
NonOwningReaderSource source(reader);
coding::DeserializerJson des(source);
des(result);
TEST_EQUAL(counters.Get(First::One), result.Get(First::One), ());
TEST_EQUAL(counters.Get(First::Two), result.Get(First::Two), ());
}
{
eye::Counters<Second, uint32_t> result;
TEST_EQUAL(result.Get(Second::One), 0, ());
TEST_EQUAL(result.Get(Second::Two), 0, ());
TEST_EQUAL(result.Get(Second::Three), 0, ());
TEST_EQUAL(result.Get(Second::Four), 0, ());
MemReader reader(data.data(), data.size());
NonOwningReaderSource source(reader);
coding::DeserializerJson des(source);
des(result);
TEST_EQUAL(result.Get(Second::One), counters.Get(First::One), ());
TEST_EQUAL(result.Get(Second::Two), counters.Get(First::Two), ());
TEST_EQUAL(result.Get(Second::Three), 0, ());
TEST_EQUAL(result.Get(Second::Four), 0, ());
}
}