From 8984d630b91dc2c5c3823d94c167ff595f019fe2 Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Thu, 6 Apr 2017 17:09:58 +0300 Subject: [PATCH] Generator test fix. --- generator/generator_tests/restriction_collector_test.cpp | 9 +++------ generator/restriction_collector.hpp | 1 + 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/generator/generator_tests/restriction_collector_test.cpp b/generator/generator_tests/restriction_collector_test.cpp index 730af536b6..75bdf4d5c7 100644 --- a/generator/generator_tests/restriction_collector_test.cpp +++ b/generator/generator_tests/restriction_collector_test.cpp @@ -30,8 +30,7 @@ string const kRestrictionTestDir = "test-restrictions"; UNIT_TEST(RestrictionTest_ValidCase) { - RestrictionCollector restrictionCollector("" /* restrictionPath */, - "" /* osmIdsToFeatureIdsPath */); + RestrictionCollector restrictionCollector; // Adding feature ids. restrictionCollector.AddFeatureId(30 /* featureId */, osm::Id::Way(3)); restrictionCollector.AddFeatureId(10 /* featureId */, osm::Id::Way(1)); @@ -56,8 +55,7 @@ UNIT_TEST(RestrictionTest_ValidCase) UNIT_TEST(RestrictionTest_InvalidCase) { - RestrictionCollector restrictionCollector("" /* restrictionPath */, - "" /* osmIdsToFeatureIdsPath */); + RestrictionCollector restrictionCollector; restrictionCollector.AddFeatureId(0 /* featureId */, osm::Id::Way(0)); restrictionCollector.AddFeatureId(20 /* featureId */, osm::Id::Way(2)); @@ -80,8 +78,7 @@ UNIT_TEST(RestrictionTest_ParseRestrictions) ScopedDir const scopedDir(kRestrictionTestDir); ScopedFile const scopedFile(kRestrictionPath, kRestrictionContent); - RestrictionCollector restrictionCollector("" /* restrictionPath */, - "" /* osmIdsToFeatureIdsPath */); + RestrictionCollector restrictionCollector; Platform const & platform = Platform(); diff --git a/generator/restriction_collector.hpp b/generator/restriction_collector.hpp index e22c8a35f4..3e66f60427 100644 --- a/generator/restriction_collector.hpp +++ b/generator/restriction_collector.hpp @@ -18,6 +18,7 @@ namespace routing class RestrictionCollector { public: + RestrictionCollector() = default; /// \param restrictionPath full path to file with road restrictions in osm id terms. /// \param osmIdsToFeatureIdsPath full path to file with mapping from osm ids to feature ids. RestrictionCollector(string const & restrictionPath, string const & osmIdsToFeatureIdsPath);