From a6bce01d6a2638a2340397b27fe4bf806a6294c1 Mon Sep 17 00:00:00 2001 From: Arsentiy Milchakov Date: Tue, 23 Jun 2020 17:55:27 +0300 Subject: [PATCH] [storage] values of enum Status are renamed (prefix E is removed). --- qt/mainwindow.cpp | 8 ++-- qt/screenshoter.cpp | 4 +- storage/storage.cpp | 24 +++++------ storage/storage_defines.cpp | 40 +++++++++---------- storage/storage_defines.hpp | 20 +++++----- storage/storage_helpers.cpp | 4 +- .../storage_group_download_tests.cpp | 14 +++---- .../storage_update_tests.cpp | 10 ++--- storage/storage_tests/storage_tests.cpp | 38 +++++++++--------- 9 files changed, 81 insertions(+), 81 deletions(-) diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp index ae359abff3..2f41c5bd5a 100644 --- a/qt/mainwindow.cpp +++ b/qt/mainwindow.cpp @@ -586,7 +586,7 @@ void MainWindow::CreateCountryStatusControls() storage::Status status, uint64_t sizeInBytes, uint8_t progress) { m_lastCountry = countryId; - if (m_lastCountry.empty() || status == storage::Status::EOnDisk || status == storage::Status::EOnDiskOutOfDate) + if (m_lastCountry.empty() || status == storage::Status::OnDisk || status == storage::Status::OnDiskOutOfDate) { m_downloadButton->setVisible(false); m_retryButton->setVisible(false); @@ -594,7 +594,7 @@ void MainWindow::CreateCountryStatusControls() } else { - if (status == storage::Status::ENotDownloaded) + if (status == storage::Status::NotDownloaded) { m_downloadButton->setVisible(true); m_retryButton->setVisible(false); @@ -607,7 +607,7 @@ void MainWindow::CreateCountryStatusControls() str << "Download (" << countryName << ") " << sizeToDownload << units; m_downloadButton->setText(str.str().c_str()); } - else if (status == storage::Status::EDownloading) + else if (status == storage::Status::Downloading) { m_downloadButton->setVisible(false); m_retryButton->setVisible(false); @@ -617,7 +617,7 @@ void MainWindow::CreateCountryStatusControls() str << "Downloading (" << countryName << ") " << (int)progress << "%"; m_downloadingStatusLabel->setText(str.str().c_str()); } - else if (status == storage::Status::EInQueue) + else if (status == storage::Status::InQueue) { m_downloadButton->setVisible(false); m_retryButton->setVisible(false); diff --git a/qt/screenshoter.cpp b/qt/screenshoter.cpp index ec7c416357..273a297421 100644 --- a/qt/screenshoter.cpp +++ b/qt/screenshoter.cpp @@ -275,7 +275,7 @@ void Screenshoter::PrepareCountries() false /* rough */); for (auto const & countryId : countryIds) { - if (storage.CountryStatusEx(countryId) == storage::Status::ENotDownloaded) + if (storage.CountryStatusEx(countryId) == storage::Status::NotDownloaded) { ChangeState(State::WaitCountries); m_countriesToDownload.insert(countryId); @@ -297,7 +297,7 @@ void Screenshoter::OnCountryChanged(storage::CountryId countryId) return; auto const status = m_framework.GetStorage().CountryStatusEx(countryId); - if (status == storage::Status::EOnDisk) + if (status == storage::Status::OnDisk) { m_countriesToDownload.erase(countryId); if (m_countriesToDownload.empty()) diff --git a/storage/storage.cpp b/storage/storage.cpp index 07997142d4..1185d5724b 100644 --- a/storage/storage.cpp +++ b/storage/storage.cpp @@ -445,40 +445,40 @@ Status Storage::CountryStatus(CountryId const & countryId) const // Check if this country has failed while downloading. if (m_failedCountries.count(countryId) > 0) - return Status::EDownloadFailed; + return Status::DownloadFailed; // Check if we are already downloading this country or have it in the queue. if (IsCountryInQueue(countryId)) { if (m_downloadingCountries.find(countryId) != m_downloadingCountries.cend()) - return Status::EDownloading; + return Status::Downloading; - return Status::EInQueue; + return Status::InQueue; } if (IsDiffApplyingInProgressToCountry(countryId)) - return Status::EApplying; + return Status::Applying; - return Status::EUnknown; + return Status::UnknownError; } Status Storage::CountryStatusEx(CountryId const & countryId) const { auto const status = CountryStatus(countryId); - if (status != Status::EUnknown) + if (status != Status::UnknownError) return status; auto localFile = GetLatestLocalFile(countryId); if (!localFile || !localFile->OnDisk(MapFileType::Map)) - return Status::ENotDownloaded; + return Status::NotDownloaded; auto const & countryFile = GetCountryFile(countryId); if (GetRemoteSize(countryFile) == 0) - return Status::EUnknown; + return Status::UnknownError; if (localFile->GetVersion() != GetCurrentDataVersion()) - return Status::EOnDiskOutOfDate; - return Status::EOnDisk; + return Status::OnDiskOutOfDate; + return Status::OnDisk; } void Storage::SaveDownloadQueue() @@ -1122,7 +1122,7 @@ bool Storage::IsNodeDownloaded(CountryId const & countryId) const bool Storage::HasLatestVersion(CountryId const & countryId) const { - return CountryStatusEx(countryId) == Status::EOnDisk; + return CountryStatusEx(countryId) == Status::OnDisk; } int64_t Storage::GetVersion(CountryId const & countryId) const @@ -1446,7 +1446,7 @@ StatusAndError Storage::GetNodeStatusInfo(CountryTree::Node const & node, node.ForEachDescendant(groupStatusCalculator); if (allOnDisk) - return ParseStatus(Status::EOnDisk); + return ParseStatus(Status::OnDisk); if (result == NodeStatus::OnDisk) return {NodeStatus::Partly, NodeErrorCode::NoError}; diff --git a/storage/storage_defines.cpp b/storage/storage_defines.cpp index d87d3af127..be3a960d34 100644 --- a/storage/storage_defines.cpp +++ b/storage/storage_defines.cpp @@ -17,25 +17,25 @@ string DebugPrint(Status status) { switch (status) { - case Status::EUndefined: + case Status::Undefined: return "EUndefined"s; - case Status::EOnDisk: + case Status::OnDisk: return "OnDisk"s; - case Status::ENotDownloaded: + case Status::NotDownloaded: return "NotDownloaded"s; - case Status::EDownloadFailed: + case Status::DownloadFailed: return "DownloadFailed"s; - case Status::EDownloading: + case Status::Downloading: return "Downloading"s; - case Status::EApplying: + case Status::Applying: return "Applying"s; - case Status::EInQueue: + case Status::InQueue: return "InQueue"s; - case Status::EUnknown: + case Status::UnknownError: return "Unknown"s; - case Status::EOnDiskOutOfDate: + case Status::OnDiskOutOfDate: return "OnDiskOutOfDate"s; - case Status::EOutOfMemFailed: + case Status::OutOfMemFailed: return "OutOfMemFailed"s; } UNREACHABLE(); @@ -87,25 +87,25 @@ StatusAndError ParseStatus(Status innerStatus) { switch (innerStatus) { - case Status::EUndefined: + case Status::Undefined: return StatusAndError(NodeStatus::Undefined, NodeErrorCode::NoError); - case Status::EOnDisk: + case Status::OnDisk: return StatusAndError(NodeStatus::OnDisk, NodeErrorCode::NoError); - case Status::ENotDownloaded: + case Status::NotDownloaded: return StatusAndError(NodeStatus::NotDownloaded, NodeErrorCode::NoError); - case Status::EDownloadFailed: + case Status::DownloadFailed: return StatusAndError(NodeStatus::Error, NodeErrorCode::NoInetConnection); - case Status::EDownloading: + case Status::Downloading: return StatusAndError(NodeStatus::Downloading, NodeErrorCode::NoError); - case Status::EApplying: + case Status::Applying: return StatusAndError(NodeStatus::Applying, NodeErrorCode::NoError); - case Status::EInQueue: + case Status::InQueue: return StatusAndError(NodeStatus::InQueue, NodeErrorCode::NoError); - case Status::EUnknown: + case Status::UnknownError: return StatusAndError(NodeStatus::Error, NodeErrorCode::UnknownError); - case Status::EOnDiskOutOfDate: + case Status::OnDiskOutOfDate: return StatusAndError(NodeStatus::OnDiskOutOfDate, NodeErrorCode::NoError); - case Status::EOutOfMemFailed: + case Status::OutOfMemFailed: return StatusAndError(NodeStatus::Error, NodeErrorCode::OutOfMemFailed); } UNREACHABLE(); diff --git a/storage/storage_defines.hpp b/storage/storage_defines.hpp index 28bfb56ff6..d25a837715 100644 --- a/storage/storage_defines.hpp +++ b/storage/storage_defines.hpp @@ -37,16 +37,16 @@ bool IsCountryIdValid(CountryId const & countryId); /// Inner status which is used inside Storage class enum class Status : uint8_t { - EUndefined = 0, - EOnDisk, /**< Downloaded mwm(s) is up to date. No need to update it. */ - ENotDownloaded, /**< Mwm can be download but not downloaded yet. */ - EDownloadFailed, /**< Downloading failed because no internet connection. */ - EDownloading, /**< Downloading a new mwm or updating an old one. */ - EApplying, /**< Applying downloaded diff for an old mwm. */ - EInQueue, /**< A mwm is waiting for downloading in the queue. */ - EUnknown, /**< Downloading failed because of unknown error. */ - EOnDiskOutOfDate, /**< An update for a downloaded mwm is ready according to counties.txt. */ - EOutOfMemFailed, /**< Downloading failed because it's not enough memory */ + Undefined = 0, + OnDisk, /**< Downloaded mwm(s) is up to date. No need to update it. */ + NotDownloaded, /**< Mwm can be download but not downloaded yet. */ + DownloadFailed, /**< Downloading failed because no internet connection. */ + Downloading, /**< Downloading a new mwm or updating an old one. */ + Applying, /**< Applying downloaded diff for an old mwm. */ + InQueue, /**< A mwm is waiting for downloading in the queue. */ + UnknownError, /**< Downloading failed because of unknown error. */ + OnDiskOutOfDate, /**< An update for a downloaded mwm is ready according to counties.txt. */ + OutOfMemFailed, /**< Downloading failed because it's not enough memory */ }; std::string DebugPrint(Status status); diff --git a/storage/storage_helpers.cpp b/storage/storage_helpers.cpp index f158269150..59526859a1 100644 --- a/storage/storage_helpers.cpp +++ b/storage/storage_helpers.cpp @@ -16,8 +16,8 @@ bool IsPointCoveredByDownloadedMaps(m2::PointD const & position, bool IsDownloadFailed(Status status) { - return status == Status::EDownloadFailed || status == Status::EOutOfMemFailed || - status == Status::EUnknown; + return status == Status::DownloadFailed || status == Status::OutOfMemFailed || + status == Status::UnknownError; } bool IsEnoughSpaceForDownload(MwmSize mwmSize) diff --git a/storage/storage_integration_tests/storage_group_download_tests.cpp b/storage/storage_integration_tests/storage_group_download_tests.cpp index f0ae83bd46..e53f4865fb 100644 --- a/storage/storage_integration_tests/storage_group_download_tests.cpp +++ b/storage/storage_integration_tests/storage_group_download_tests.cpp @@ -94,11 +94,11 @@ void DownloadGroup(Storage & storage, bool oneByOne) storage.GetChildrenInGroups(kGroupCountryId, downloaded, available); TEST(downloaded.empty(), ()); - // Check status for the all children nodes is set to ENotDownloaded. + // Check status for the all children nodes is set to NotDownloaded. MwmSize totalGroupSize = 0; for (auto const & countryId : children) { - TEST_EQUAL(Status::ENotDownloaded, storage.CountryStatusEx(countryId), ()); + TEST_EQUAL(Status::NotDownloaded, storage.CountryStatusEx(countryId), ()); NodeAttrs attrs; storage.GetNodeAttrs(countryId, attrs); TEST_EQUAL(NodeStatus::NotDownloaded, attrs.m_status, ()); @@ -106,7 +106,7 @@ void DownloadGroup(Storage & storage, bool oneByOne) totalGroupSize += attrs.m_mwmSize; } - // Check status for the group node is set to ENotDownloaded. + // Check status for the group node is set to NotDownloaded. NodeAttrs attrs; storage.GetNodeAttrs(kGroupCountryId, attrs); TEST_EQUAL(NodeStatus::NotDownloaded, attrs.m_status, ()); @@ -141,14 +141,14 @@ void DownloadGroup(Storage & storage, bool oneByOne) TEST_EQUAL(changed, subTree, ()); TEST_EQUAL(downloadedChecker, subTree, ()); - // Check status for the group node is set to EOnDisk. + // Check status for the group node is set to OnDisk. storage.GetNodeAttrs(kGroupCountryId, attrs); TEST_EQUAL(NodeStatus::OnDisk, attrs.m_status, ()); - // Check status for the all children nodes is set to EOnDisk. + // Check status for the all children nodes is set to OnDisk. for (auto const & countryId : children) { - TEST_EQUAL(Status::EOnDisk, storage.CountryStatusEx(countryId), ()); + TEST_EQUAL(Status::OnDisk, storage.CountryStatusEx(countryId), ()); NodeAttrs attrs; storage.GetNodeAttrs(countryId, attrs); TEST_EQUAL(NodeStatus::OnDisk, attrs.m_status, ()); @@ -224,7 +224,7 @@ void DeleteGroup(Storage & storage, bool oneByOne) // Check state for the all children nodes is set to NotDownloaded and NoError. for (auto const & countryId : children) { - TEST_EQUAL(Status::ENotDownloaded, storage.CountryStatusEx(countryId), ()); + TEST_EQUAL(Status::NotDownloaded, storage.CountryStatusEx(countryId), ()); NodeAttrs attrs; storage.GetNodeAttrs(countryId, attrs); TEST_EQUAL(NodeStatus::NotDownloaded, attrs.m_status, ()); diff --git a/storage/storage_integration_tests/storage_update_tests.cpp b/storage/storage_integration_tests/storage_update_tests.cpp index 5fbd71c444..5385820d49 100644 --- a/storage/storage_integration_tests/storage_update_tests.cpp +++ b/storage/storage_integration_tests/storage_update_tests.cpp @@ -110,7 +110,7 @@ UNIT_TEST(SmallMwms_Update_Test) storage.DownloadNode(kGroupCountryId); testing::RunEventLoop(); - // Check group node status is EOnDisk + // Check group node status is OnDisk NodeAttrs attrs; storage.GetNodeAttrs(kGroupCountryId, attrs); TEST_EQUAL(NodeStatus::OnDisk, attrs.m_status, ()); @@ -142,12 +142,12 @@ UNIT_TEST(SmallMwms_Update_Test) CountriesVec children; storage.GetChildren(kGroupCountryId, children); - // Check group node status is EOnDiskOutOfDate + // Check group node status is OnDiskOutOfDate NodeAttrs attrs; storage.GetNodeAttrs(kGroupCountryId, attrs); TEST_EQUAL(NodeStatus::OnDiskOutOfDate, attrs.m_status, ()); - // Check children node status is EOnDiskOutOfDate + // Check children node status is OnDiskOutOfDate for (auto const & child : children) { NodeAttrs attrs; @@ -166,11 +166,11 @@ UNIT_TEST(SmallMwms_Update_Test) storage.DownloadNode(kGroupCountryId); testing::RunEventLoop(); - // Check group node status is EOnDisk + // Check group node status is OnDisk storage.GetNodeAttrs(kGroupCountryId, attrs); TEST_EQUAL(NodeStatus::OnDisk, attrs.m_status, ()); - // Check children node status is EOnDisk + // Check children node status is OnDisk for (auto const & child : children) { NodeAttrs attrs; diff --git a/storage/storage_tests/storage_tests.cpp b/storage/storage_tests/storage_tests.cpp index bad47cac23..bfa74f78a2 100644 --- a/storage/storage_tests/storage_tests.cpp +++ b/storage/storage_tests/storage_tests.cpp @@ -270,8 +270,8 @@ protected: TEST_LESS(m_currStatus + 1, m_transitionList.size(), (m_countryFile)); TEST_EQUAL(nexStatus, m_transitionList[m_currStatus + 1], (m_countryFile)); ++m_currStatus; - if (m_transitionList[m_currStatus] == Status::EDownloading || - m_transitionList[m_currStatus] == Status::EInQueue) + if (m_transitionList[m_currStatus] == Status::Downloading || + m_transitionList[m_currStatus] == Status::InQueue) { LocalAndRemoteSize localAndRemoteSize = m_storage.CountrySizeInBytes(m_countryId); m_totalBytesToDownload = localAndRemoteSize.second; @@ -315,7 +315,7 @@ public: TaskRunner & runner) : CountryDownloaderChecker( storage, countryId, MapFileType::Map, - vector{Status::ENotDownloaded, Status::EInQueue, Status::EDownloading, Status::ENotDownloaded}) + vector{Status::NotDownloaded, Status::InQueue, Status::Downloading, Status::NotDownloaded}) , m_runner(runner) { } @@ -345,7 +345,7 @@ unique_ptr AbsentCountryDownloaderChecker(Storage & st { return make_unique( storage, countryId, type, - vector{Status::ENotDownloaded, Status::EInQueue, Status::EDownloading, Status::EOnDisk}); + vector{Status::NotDownloaded, Status::InQueue, Status::Downloading, Status::OnDisk}); } // Checks following state transitions: @@ -356,7 +356,7 @@ unique_ptr CancelledCountryDownloaderChecker(Storage & { return make_unique( storage, countryId, type, - vector{Status::ENotDownloaded, Status::EInQueue, Status::EDownloading, Status::ENotDownloaded}); + vector{Status::NotDownloaded, Status::InQueue, Status::Downloading, Status::NotDownloaded}); } class CountryStatusChecker @@ -430,7 +430,7 @@ public: if (countryId != m_countryId) return; Status const status = m_storage.CountryStatusEx(countryId); - if (status != Status::EDownloadFailed) + if (status != Status::DownloadFailed) return; lock_guard lock(m_mu); m_finished = true; @@ -551,21 +551,21 @@ UNIT_TEST(StorageTest_DeleteTwoVersionsOfTheSameCountry) storage.DeleteCountry(countryId, MapFileType::Map); LocalFilePtr latestLocalFile = storage.GetLatestLocalFile(countryId); TEST(!latestLocalFile.get(), ("Country wasn't deleted from disk.")); - TEST_EQUAL(Status::ENotDownloaded, storage.CountryStatusEx(countryId), ()); + TEST_EQUAL(Status::NotDownloaded, storage.CountryStatusEx(countryId), ()); LocalFilePtr localFileV1 = CreateDummyMapFile(countryFile, v1, 1024 /* size */); storage.RegisterAllLocalMaps(false /* enableDiffs */); latestLocalFile = storage.GetLatestLocalFile(countryId); TEST(latestLocalFile.get(), ("Created map file wasn't found by storage.")); TEST_EQUAL(latestLocalFile->GetVersion(), localFileV1->GetVersion(), ()); - TEST_EQUAL(Status::EOnDiskOutOfDate, storage.CountryStatusEx(countryId), ()); + TEST_EQUAL(Status::OnDiskOutOfDate, storage.CountryStatusEx(countryId), ()); LocalFilePtr localFileV2 = CreateDummyMapFile(countryFile, v2, 2048 /* size */); storage.RegisterAllLocalMaps(false /* enableDiffs */); latestLocalFile = storage.GetLatestLocalFile(countryId); TEST(latestLocalFile.get(), ("Created map file wasn't found by storage.")); TEST_EQUAL(latestLocalFile->GetVersion(), localFileV2->GetVersion(), ()); - TEST_EQUAL(Status::EOnDiskOutOfDate, storage.CountryStatusEx(countryId), ()); + TEST_EQUAL(Status::OnDiskOutOfDate, storage.CountryStatusEx(countryId), ()); storage.DeleteCountry(countryId, MapFileType::Map); @@ -575,7 +575,7 @@ UNIT_TEST(StorageTest_DeleteTwoVersionsOfTheSameCountry) localFileV2->SyncWithDisk(); TEST(!localFileV2->HasFiles(), ()); - TEST_EQUAL(Status::ENotDownloaded, storage.CountryStatusEx(countryId), ()); + TEST_EQUAL(Status::NotDownloaded, storage.CountryStatusEx(countryId), ()); } UNIT_CLASS_TEST(StorageTest, DeletePendingCountry) @@ -770,13 +770,13 @@ UNIT_CLASS_TEST(StorageTest, DownloadedMap) { auto algeriaCentralChecker = make_unique( storage, algeriaCentralCountryId, MapFileType::Map, - vector{Status::ENotDownloaded, Status::EInQueue, Status::EDownloading, - Status::EOnDisk}); + vector{Status::NotDownloaded, Status::InQueue, Status::Downloading, + Status::OnDisk}); auto algeriaCoastChecker = make_unique( storage, algeriaCoastCountryId, MapFileType::Map, - vector{Status::ENotDownloaded, Status::EInQueue, Status::EDownloading, - Status::EOnDisk}); + vector{Status::NotDownloaded, Status::InQueue, Status::Downloading, + Status::OnDisk}); algeriaCentralChecker->StartDownload(); algeriaCoastChecker->StartDownload(); @@ -1064,11 +1064,11 @@ UNIT_TEST(StorageTest_GetUpdateInfoSingleMwm) UNIT_TEST(StorageTest_ParseStatus) { TEST_EQUAL(StatusAndError(NodeStatus::Undefined, NodeErrorCode::NoError), - ParseStatus(Status::EUndefined), ()); + ParseStatus(Status::Undefined), ()); TEST_EQUAL(StatusAndError(NodeStatus::Error, NodeErrorCode::NoInetConnection), - ParseStatus(Status::EDownloadFailed), ()); + ParseStatus(Status::DownloadFailed), ()); TEST_EQUAL(StatusAndError(NodeStatus::Downloading, NodeErrorCode::NoError), - ParseStatus(Status::EDownloading), ()); + ParseStatus(Status::Downloading), ()); } UNIT_TEST(StorageTest_ForEachInSubtree) @@ -1476,7 +1476,7 @@ UNIT_CLASS_TEST(StorageTest, MultipleMaps) auto const onStatusChange = [&](CountryId const & id) { auto const status = storage.CountryStatusEx(id); - if (status != Status::EOnDisk) + if (status != Status::OnDisk) return; auto const it = find(children.cbegin(), children.cend(), id); @@ -1507,6 +1507,6 @@ UNIT_CLASS_TEST(StorageTest, MultipleMaps) } // Unfortunately, whole country was not downloaded. - TEST_EQUAL(storage.CountryStatusEx(nodeId), Status::ENotDownloaded, ()); + TEST_EQUAL(storage.CountryStatusEx(nodeId), Status::NotDownloaded, ()); } } // namespace storage