From aa0766233de770f3aaadd8883b54382cd4603760 Mon Sep 17 00:00:00 2001 From: Alexander Borsuk Date: Sat, 1 Jan 2022 22:43:50 +0100 Subject: [PATCH] Unity warning fix --- routing/routing_benchmarks/pedestrian_routing_tests.cpp | 6 +++--- search/search_tests/locality_finder_test.cpp | 4 ++-- search/search_tests/locality_scorer_test.cpp | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/routing/routing_benchmarks/pedestrian_routing_tests.cpp b/routing/routing_benchmarks/pedestrian_routing_tests.cpp index dbfbb947e5..b4398092b2 100644 --- a/routing/routing_benchmarks/pedestrian_routing_tests.cpp +++ b/routing/routing_benchmarks/pedestrian_routing_tests.cpp @@ -12,10 +12,10 @@ #include #include +namespace pedestrian_routing_tests +{ using namespace std; -namespace -{ // Test preconditions: files from the kPedestrianMapFiles set with '.mwm' // extension must be placed in omim/data folder. set const kPedestrianMapFiles = @@ -61,7 +61,6 @@ protected: FrozenDataSource m_dataSource; }; -} // namespace // Tests on features ------------------------------------------------------------------------------- UNIT_CLASS_TEST(PedestrianTest, UK_Long1) @@ -292,3 +291,4 @@ UNIT_CLASS_TEST(PedestrianTest, UK_Test18) TestTwoPoints(m2::PointD(0.57712, 60.31156), m2::PointD(-1.09911, 59.24341)); } #endif +} // namespace pedestrian_routing_tests diff --git a/search/search_tests/locality_finder_test.cpp b/search/search_tests/locality_finder_test.cpp index 2731f6951a..f28be8d732 100644 --- a/search/search_tests/locality_finder_test.cpp +++ b/search/search_tests/locality_finder_test.cpp @@ -19,7 +19,7 @@ #include #include -namespace +namespace locality_finder_test { class LocalityFinderTest : public generator::tests_support::TestWithClassificator { @@ -81,7 +81,6 @@ public: void ClearCaches() { m_finder.ClearCache(); } }; -} // namespace UNIT_CLASS_TEST(LocalityFinderTest, Smoke) { @@ -138,3 +137,4 @@ UNIT_CLASS_TEST(LocalityFinderTest, Moscow) RunTests(input, results); } +} // namespace locality_finder_test diff --git a/search/search_tests/locality_scorer_test.cpp b/search/search_tests/locality_scorer_test.cpp index d00f27efdc..0da3b7ab11 100644 --- a/search/search_tests/locality_scorer_test.cpp +++ b/search/search_tests/locality_scorer_test.cpp @@ -24,12 +24,12 @@ #include #include +namespace locality_scorer_test +{ using namespace search; using namespace std; using namespace strings; -namespace -{ class LocalityScorerTest : public LocalityScorer::Delegate { public: @@ -164,7 +164,6 @@ protected: base::MemTrie> m_searchIndex; }; -} // namespace UNIT_CLASS_TEST(LocalityScorerTest, Smoke) { @@ -344,3 +343,4 @@ UNIT_CLASS_TEST(LocalityScorerTest, MatchedRegion) TEST_EQUAL(GetTopLocalities(3 /* limit */), Ids({ID_SPRINGFIELD_MATCHED_REGION, ID_SPRINGFIELD_CLOSE, ID_SPRINGFIELD_RANK1}), ()); } +} // namespace locality_scorer_test