Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlga Khlopkova <o.khlopkova@corp.mail.ru>2020-08-21 11:39:43 +0300
committerldo2 <ldo2.msiu@gmail.com>2020-08-21 18:15:08 +0300
commit95a6c22bf60b6ba152144317bdf3f4e42cb7c4fc (patch)
tree7176d9ce9b5801bb703067a9950f0d6d318f2a64 /transit
parentfe35a2d8fc44ba2975032351ddf0a23b696c19ad (diff)
[transit] Tests for working with lines metadata.
Diffstat (limited to 'transit')
-rw-r--r--transit/transit_experimental_tests/parse_transit_from_json_tests.cpp29
-rw-r--r--transit/transit_experimental_tests/transit_serdes_tests.cpp9
-rw-r--r--transit/transit_tests/transit_tools.hpp6
3 files changed, 43 insertions, 1 deletions
diff --git a/transit/transit_experimental_tests/parse_transit_from_json_tests.cpp b/transit/transit_experimental_tests/parse_transit_from_json_tests.cpp
index 240820a9f8..7c764f7a19 100644
--- a/transit/transit_experimental_tests/parse_transit_from_json_tests.cpp
+++ b/transit/transit_experimental_tests/parse_transit_from_json_tests.cpp
@@ -150,6 +150,35 @@ UNIT_TEST(ReadJson_Line)
TestEqual(linesFact, linesPlan);
}
+UNIT_TEST(ReadJson_LineMetadata)
+{
+ std::vector<std::string> const lineByLineJson{
+ R"({
+ "id":56,
+ "shape_segments":[
+ {
+ "order":-1,
+ "start_index":34,
+ "end_index":99
+ },
+ {
+ "order":-3,
+ "start_index":99,
+ "end_index":1069
+ }
+ ]
+ })"};
+
+ std::vector<LineMetadata> const linesMetadataPlan = {LineMetadata(
+ 56 /* id */,
+ LineSegmentsOrder{LineSegmentOrder({34, 99}, -1), LineSegmentOrder({99, 1069}, -3)})};
+
+ std::vector<LineMetadata> linesMetadataFact;
+
+ FillContainer(lineByLineJson, linesMetadataFact);
+ TestEqual(linesMetadataFact, linesMetadataPlan);
+}
+
UNIT_TEST(ReadJson_Stop)
{
std::vector<std::string> const lineByLineJson{
diff --git a/transit/transit_experimental_tests/transit_serdes_tests.cpp b/transit/transit_experimental_tests/transit_serdes_tests.cpp
index b96a6d21a5..93bf754da9 100644
--- a/transit/transit_experimental_tests/transit_serdes_tests.cpp
+++ b/transit/transit_experimental_tests/transit_serdes_tests.cpp
@@ -33,6 +33,7 @@ void TestEqual(TransitData const & actualTransit, TransitData const & expectedTr
TestEqual(actualTransit.GetEdges(), expectedTransit.GetEdges());
TestEqual(actualTransit.GetTransfers(), expectedTransit.GetTransfers());
TestEqual(actualTransit.GetLines(), expectedTransit.GetLines());
+ TestEqual(actualTransit.GetLinesMetadata(), expectedTransit.GetLinesMetadata());
TestEqual(actualTransit.GetShapes(), expectedTransit.GetShapes());
TestEqual(actualTransit.GetRoutes(), expectedTransit.GetRoutes());
TestEqual(actualTransit.GetNetworks(), expectedTransit.GetNetworks());
@@ -52,9 +53,10 @@ void TestEqual(TransitData const & actualTransit, TransitData const & expectedTr
case TransitUseCase::Rendering:
TestEqual(actualTransit.GetStops(), expectedTransit.GetStops());
TEST(actualTransit.GetGates().empty(), ());
- TEST(actualTransit.GetEdges().empty(), ());
+ TestEqual(actualTransit.GetEdges(), expectedTransit.GetEdges());
TestEqual(actualTransit.GetTransfers(), expectedTransit.GetTransfers());
TestEqual(actualTransit.GetLines(), expectedTransit.GetLines());
+ TestEqual(actualTransit.GetLinesMetadata(), expectedTransit.GetLinesMetadata());
TestEqual(actualTransit.GetShapes(), expectedTransit.GetShapes());
TestEqual(actualTransit.GetRoutes(), expectedTransit.GetRoutes());
TEST(actualTransit.GetNetworks().empty(), ());
@@ -146,6 +148,11 @@ TransitData FillTestTransitData()
"21-2020 Sep 25, 2020 Sep 28-2020 Oct 02, 2020 Oct 05-2020 Oct 09, 2020 Oct 13-2020 "
"Oct 16, 2020 Oct 19-2020 Oct 20") /* serviceDays */)};
+ data.m_linesMetadata = {
+ LineMetadata(4036598626 /* id */, LineSegmentsOrder{LineSegmentOrder({0, 100}, 0),
+ LineSegmentOrder({100, 205}, 2)}),
+ LineMetadata(4036598627 /* id */, LineSegmentsOrder{})};
+
data.m_stops = {Stop(4026990853 /* id */, kInvalidFeatureId /* featureId */,
kInvalidOsmId /* osmId */, Translations{{"en", "CARLOS DIHEL 2500-2598"}},
TimeTable{{4026763635, osmoh::OpeningHours("06:00-06:00 open")},
diff --git a/transit/transit_tests/transit_tools.hpp b/transit/transit_tests/transit_tools.hpp
index ef83e27403..8185824ceb 100644
--- a/transit/transit_tests/transit_tools.hpp
+++ b/transit/transit_tests/transit_tools.hpp
@@ -57,6 +57,12 @@ inline bool Equal(Line const & l1, Line const & l2)
l2.GetIntervals(), l2.GetServiceDays(), l2.GetShapeLink());
}
+inline bool Equal(LineMetadata const & lm1, LineMetadata const & lm2)
+{
+ return std::make_tuple(lm1.GetId(), lm1.GetLineSegmentsOrder()) ==
+ std::make_tuple(lm2.GetId(), lm2.GetLineSegmentsOrder());
+}
+
inline bool Equal(Stop const & s1, Stop const & s2)
{
return (std::make_tuple(s1.GetId(), s1.GetFeatureId(), s1.GetOsmId(), s1.GetTitle(),