From 884939fc74acd3987a011e6ca45480bf08156a61 Mon Sep 17 00:00:00 2001 From: Sergey Yershov Date: Mon, 18 Apr 2016 17:42:12 +0300 Subject: [PATCH] [downloader] Review fixes --- storage/storage.cpp | 3 ++- storage/storage_tests/storage_tests.cpp | 11 ++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/storage/storage.cpp b/storage/storage.cpp index f21727d634..b1ee070bef 100644 --- a/storage/storage.cpp +++ b/storage/storage.cpp @@ -1577,7 +1577,7 @@ void Storage::GetGroupNodePathToRoot(TCountryId const & groupNode, TCountriesVec if (nodes.size() != 1) { - LOG(LWARNING, (groupNode, "Group node can't have more then one parent.")); + LOG(LWARNING, (groupNode, "Group node can't have more than one parent.")); return; } @@ -1591,6 +1591,7 @@ void Storage::GetGroupNodePathToRoot(TCountryId const & groupNode, TCountriesVec { path.push_back(id); }); + path.push_back(m_countries.GetRoot().Value().Name()); } } // namespace storage diff --git a/storage/storage_tests/storage_tests.cpp b/storage/storage_tests/storage_tests.cpp index 76e1fdf607..13f6a54c96 100644 --- a/storage/storage_tests/storage_tests.cpp +++ b/storage/storage_tests/storage_tests.cpp @@ -1655,16 +1655,21 @@ UNIT_TEST(StorageTest_GetGroupNodePathToRootTest) TEST(path.empty(), ()); storage.GetGroupNodePathToRoot("France_Auvergne", path); - TEST_EQUAL(path.size(), 1, (path)); + TEST_EQUAL(path.size(), 2, (path)); + TEST_EQUAL(path[0], "France", ()); + TEST_EQUAL(path[1], "Countries", ()); storage.GetGroupNodePathToRoot("France", path); - TEST(path.empty(), ()); + TEST_EQUAL(path.size(), 1, (path)); + TEST_EQUAL(path[0], "Countries", ()); storage.GetGroupNodePathToRoot("US_Florida_Miami", path); TEST(path.empty(), ()); storage.GetGroupNodePathToRoot("Florida", path); - TEST_EQUAL(path.size(), 1, (path)); + TEST_EQUAL(path.size(), 2, (path)); + TEST_EQUAL(path[0], "United States of America", ()); + TEST_EQUAL(path[1], "Countries", ()); storage.GetGroupNodePathToRoot("Country1", path); TEST(path.empty(), ());