From 2c3a6ae6e17a8d2ff8f1c9654ca20c1527024be9 Mon Sep 17 00:00:00 2001
From: Maksim Andrianov <maksimandrianov1@gmail.com>
Date: Wed, 8 May 2019 12:04:51 +0300
Subject: [PATCH] [generator] Fixed node_mixer_test. (#10853)

---
 generator/generator_tests/node_mixer_test.cpp | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/generator/generator_tests/node_mixer_test.cpp b/generator/generator_tests/node_mixer_test.cpp
index 13fc56f136..ea139278ec 100644
--- a/generator/generator_tests/node_mixer_test.cpp
+++ b/generator/generator_tests/node_mixer_test.cpp
@@ -8,50 +8,50 @@
 UNIT_TEST(NodeMixerTests)
 {
   std::istringstream stream1("");
-  generator::MixFakeNodes(stream1, [](OsmElement * p) {
+  generator::MixFakeNodes(stream1, [](OsmElement & p) {
     TEST(false, ("Returned an object for an empty input stream."));
   });
 
   std::istringstream stream2("shop=gift\nname=Shop\n");
-  generator::MixFakeNodes(stream2, [](OsmElement * p) {
+  generator::MixFakeNodes(stream2, [](OsmElement & p) {
     TEST(false, ("Returned an object for a source without coordinates."));
   });
 
   std::istringstream stream3("lat=4.0\nlon=-4.1\n");
-  generator::MixFakeNodes(stream3, [](OsmElement * p) {
+  generator::MixFakeNodes(stream3, [](OsmElement & p) {
     TEST(false, ("Returned an object for a source without tags."));
   });
 
   std::istringstream stream4("lat=10.0\nlon=-4.8\nshop=gift\nname=Shop");
   int count4 = 0;
-  generator::MixFakeNodes(stream4, [&](OsmElement * p) {
+  generator::MixFakeNodes(stream4, [&](OsmElement & p) {
     count4++;
-    TEST_EQUAL(p->type, OsmElement::EntityType::Node, ());
-    TEST_EQUAL(p->lat, 10.0, ());
-    TEST_EQUAL(p->lon, -4.8, ());
-    TEST_EQUAL(p->Tags().size(), 2, ());
-    TEST_EQUAL(p->GetTag("name"), "Shop", ());
+    TEST_EQUAL(p.type, OsmElement::EntityType::Node, ());
+    TEST_EQUAL(p.lat, 10.0, ());
+    TEST_EQUAL(p.lon, -4.8, ());
+    TEST_EQUAL(p.Tags().size(), 2, ());
+    TEST_EQUAL(p.GetTag("name"), "Shop", ());
   });
   TEST_EQUAL(count4, 1, ());
 
   std::istringstream stream5("lat=10.0\nlon=-4.8\nid=1\nname=First\n\nid=2\nlat=60\nlon=1\nname=Second\n\n\n");
   int count5 = 0;
-  generator::MixFakeNodes(stream5, [&](OsmElement * p) {
+  generator::MixFakeNodes(stream5, [&](OsmElement & p) {
     count5++;
-    TEST_EQUAL(p->type, OsmElement::EntityType::Node, ());
-    TEST_EQUAL(p->Tags().size(), 2, ());
-    std::string id = p->GetTag("id");
+    TEST_EQUAL(p.type, OsmElement::EntityType::Node, ());
+    TEST_EQUAL(p.Tags().size(), 2, ());
+    std::string id = p.GetTag("id");
     TEST(!id.empty(), ("No id tag when every object has it."));
-    TEST_EQUAL(p->GetTag("name"), id == "1" ? "First" : "Second", ());
+    TEST_EQUAL(p.GetTag("name"), id == "1" ? "First" : "Second", ());
   });
   TEST_EQUAL(count5, 2, ());
 
   std::istringstream stream6("lat=0\nlon=-4.8\nshop=mall");
   int count6 = 0;
-  generator::MixFakeNodes(stream6, [&](OsmElement * p) {
+  generator::MixFakeNodes(stream6, [&](OsmElement & p) {
     count6++;
-    TEST_EQUAL(p->lat, 0.0, ());
-    TEST_EQUAL(p->lon, -4.8, ());
+    TEST_EQUAL(p.lat, 0.0, ());
+    TEST_EQUAL(p.lon, -4.8, ());
   });
   TEST_EQUAL(count6, 1, ());
 }