diff options
author | Sergey Yershov <yershov@corp.mail.ru> | 2015-09-01 11:43:27 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 03:03:22 +0300 |
commit | a8d41e17d703c55ce59ab4e15f4ce1a2ca21c81b (patch) | |
tree | eb711e1f7fc3d414aa799b39eaa9fdeb224613ca /generator/generator_tests | |
parent | 1797673d046ef4a7add3fe253d87bf9e56113d76 (diff) |
Review fix
Diffstat (limited to 'generator/generator_tests')
-rw-r--r-- | generator/generator_tests/intermediate_data_test.cpp | 56 |
1 files changed, 11 insertions, 45 deletions
diff --git a/generator/generator_tests/intermediate_data_test.cpp b/generator/generator_tests/intermediate_data_test.cpp index 256e51236b..36101c6f1d 100644 --- a/generator/generator_tests/intermediate_data_test.cpp +++ b/generator/generator_tests/intermediate_data_test.cpp @@ -33,14 +33,11 @@ UNIT_TEST(Intermediate_Data_empty_way_element_save_load_test) UNIT_TEST(Intermediate_Data_way_element_save_load_test) { + vector<uint64_t> testData = {0, 1, 2, 3, 0xFFFFFFFF, 0xFFFFFFFFFFFFFFFF}; + WayElement e1(1 /* fake osm id */); - e1.nodes.push_back(0); - e1.nodes.push_back(1); - e1.nodes.push_back(2); - e1.nodes.push_back(3); - e1.nodes.push_back(0xFFFFFFFF); - e1.nodes.push_back(0xFFFFFFFFFFFFFFFF); + e1.nodes = testData; using TBuffer = vector<uint8_t>; TBuffer buffer; @@ -54,28 +51,17 @@ UNIT_TEST(Intermediate_Data_way_element_save_load_test) e2.Read(r); - TEST_EQUAL(e2.nodes.size(), 6, ()); - TEST_EQUAL(e2.nodes[0], 0, ()); - TEST_EQUAL(e2.nodes[1], 1, ()); - TEST_EQUAL(e2.nodes[2], 2, ()); - TEST_EQUAL(e2.nodes[3], 3, ()); - TEST_EQUAL(e2.nodes[4], 0xFFFFFFFF, ()); - TEST_EQUAL(e2.nodes[5], 0xFFFFFFFFFFFFFFFF, ()); + TEST_EQUAL(e2.nodes, testData, ()); } UNIT_TEST(Intermediate_Data_relation_element_save_load_test) { - RelationElement e1; + RelationElement::TMembers testData = {{1, "inner"}, {2, "outer"}, {3, "unknown"}, {4, "inner role"}}; - e1.nodes.emplace_back(1, "inner"); - e1.nodes.emplace_back(2, "outer"); - e1.nodes.emplace_back(3, "unknown"); - e1.nodes.emplace_back(4, "inner role"); + RelationElement e1; - e1.ways.emplace_back(1, "inner"); - e1.ways.emplace_back(2, "outer"); - e1.ways.emplace_back(3, "unknown"); - e1.ways.emplace_back(4, "inner role"); + e1.nodes = testData; + e1.ways = testData; e1.tags.emplace("key1","value1"); e1.tags.emplace("key2","value2"); @@ -101,30 +87,10 @@ UNIT_TEST(Intermediate_Data_relation_element_save_load_test) e2.Read(r); - TEST_EQUAL(e2.nodes.size(), 4, ()); - TEST_EQUAL(e2.ways.size(), 4, ()); - TEST_EQUAL(e2.tags.size(), 4, ()); - - TEST_EQUAL(e2.nodes[0].first, 1, ()); - TEST_EQUAL(e2.nodes[1].first, 2, ()); - TEST_EQUAL(e2.nodes[2].first, 3, ()); - TEST_EQUAL(e2.nodes[3].first, 4, ()); - - TEST_EQUAL(e2.nodes[0].second, "inner", ()); - TEST_EQUAL(e2.nodes[1].second, "outer", ()); - TEST_EQUAL(e2.nodes[2].second, "unknown", ()); - TEST_EQUAL(e2.nodes[3].second, "inner role", ()); - - TEST_EQUAL(e2.ways[0].first, 1, ()); - TEST_EQUAL(e2.ways[1].first, 2, ()); - TEST_EQUAL(e2.ways[2].first, 3, ()); - TEST_EQUAL(e2.ways[3].first, 4, ()); - - TEST_EQUAL(e2.ways[0].second, "inner", ()); - TEST_EQUAL(e2.ways[1].second, "outer", ()); - TEST_EQUAL(e2.ways[2].second, "unknown", ()); - TEST_EQUAL(e2.ways[3].second, "inner role", ()); + TEST_EQUAL(e2.nodes, testData, ()); + TEST_EQUAL(e2.ways, testData, ()); + TEST_EQUAL(e2.tags.size(), 4, ()); TEST_EQUAL(e2.tags["key1"], "value1", ()); TEST_EQUAL(e2.tags["key2"], "value2", ()); TEST_EQUAL(e2.tags["key3"], "value3", ()); |