Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Byko-Ianko <v.bykoianko@corp.mail.ru>2016-02-04 17:32:15 +0300
committerSergey Yershov <yershov@corp.mail.ru>2016-03-23 16:21:50 +0300
commit6f8c37e958bd2ac6351088259c0c16a9a7ce0996 (patch)
tree72e0b774ea8c59146c9b6ab38d046a1e01488683 /storage/storage_integration_tests
parentfd9fa541f6af1e09175da0fc8e76822e0075c9c3 (diff)
[new downloader] Getting rid of letter T in the beginging of enum classes
Diffstat (limited to 'storage/storage_integration_tests')
-rw-r--r--storage/storage_integration_tests/migrate_tests.cpp2
-rw-r--r--storage/storage_integration_tests/storage_downloading_tests.cpp4
-rw-r--r--storage/storage_integration_tests/storage_group_download_tests.cpp18
-rw-r--r--storage/storage_integration_tests/storage_update_tests.cpp10
4 files changed, 17 insertions, 17 deletions
diff --git a/storage/storage_integration_tests/migrate_tests.cpp b/storage/storage_integration_tests/migrate_tests.cpp
index dca8252905..aa5423bbb2 100644
--- a/storage/storage_integration_tests/migrate_tests.cpp
+++ b/storage/storage_integration_tests/migrate_tests.cpp
@@ -51,7 +51,7 @@ UNIT_TEST(StorageMigrationTests)
auto statePrefetchChanged = [&](TCountryId const & id)
{
- TStatus const nextStatus = f.Storage().m_prefetchStorage->CountryStatusEx(id);
+ Status const nextStatus = f.Storage().m_prefetchStorage->CountryStatusEx(id);
LOG_SHORT(LINFO, (id, "status :", nextStatus));
if (!f.Storage().m_prefetchStorage->IsDownloadInProgress())
{
diff --git a/storage/storage_integration_tests/storage_downloading_tests.cpp b/storage/storage_integration_tests/storage_downloading_tests.cpp
index bad79c6708..e72097ba31 100644
--- a/storage/storage_integration_tests/storage_downloading_tests.cpp
+++ b/storage/storage_integration_tests/storage_downloading_tests.cpp
@@ -101,11 +101,11 @@ UNIT_TEST(SmallMwms_InterruptDownloadResumeDownload_Test)
NodeAttrs attrs;
storage.GetNodeAttrs(kCountryId, attrs);
- TEST_EQUAL(TNodeStatus::Downloading, attrs.m_status, ());
+ TEST_EQUAL(NodeStatus::Downloading, attrs.m_status, ());
storage.DownloadNode(kCountryId);
testing::RunEventLoop();
storage.GetNodeAttrs(kCountryId, attrs);
- TEST_EQUAL(TNodeStatus::OnDisk, attrs.m_status, ());
+ TEST_EQUAL(NodeStatus::OnDisk, attrs.m_status, ());
}
diff --git a/storage/storage_integration_tests/storage_group_download_tests.cpp b/storage/storage_integration_tests/storage_group_download_tests.cpp
index d41b69bff8..6d0d9f51e1 100644
--- a/storage/storage_integration_tests/storage_group_download_tests.cpp
+++ b/storage/storage_integration_tests/storage_group_download_tests.cpp
@@ -103,10 +103,10 @@ void DownloadGroup(Storage & storage, bool oneByOne)
size_t totalGroupSize = 0;
for (auto const & countryId : children)
{
- TEST_EQUAL(TStatus::ENotDownloaded, storage.CountryStatusEx(countryId), ());
+ TEST_EQUAL(Status::ENotDownloaded, storage.CountryStatusEx(countryId), ());
NodeAttrs attrs;
storage.GetNodeAttrs(countryId, attrs);
- TEST_EQUAL(TNodeStatus::NotDownloaded, attrs.m_status, ());
+ TEST_EQUAL(NodeStatus::NotDownloaded, attrs.m_status, ());
TEST_GREATER(attrs.m_mwmSize, 0, ());
totalGroupSize += attrs.m_mwmSize;
}
@@ -114,7 +114,7 @@ void DownloadGroup(Storage & storage, bool oneByOne)
// Check status for the group node is set to ENotDownloaded
NodeAttrs attrs;
storage.GetNodeAttrs(kGroupCountryId, attrs);
- TEST_EQUAL(TNodeStatus::NotDownloaded, attrs.m_status, ());
+ TEST_EQUAL(NodeStatus::NotDownloaded, attrs.m_status, ());
TEST_EQUAL(attrs.m_mwmSize, totalGroupSize, ());
attrs = NodeAttrs();
@@ -148,15 +148,15 @@ void DownloadGroup(Storage & storage, bool oneByOne)
// Check status for the group node is set to EOnDisk
storage.GetNodeAttrs(kGroupCountryId, attrs);
- TEST_EQUAL(TNodeStatus::OnDisk, attrs.m_status, ());
+ TEST_EQUAL(NodeStatus::OnDisk, attrs.m_status, ());
// Check status for the all children nodes is set to EOnDisk
for (auto const & countryId : children)
{
- TEST_EQUAL(TStatus::EOnDisk, storage.CountryStatusEx(countryId), ());
+ TEST_EQUAL(Status::EOnDisk, storage.CountryStatusEx(countryId), ());
NodeAttrs attrs;
storage.GetNodeAttrs(countryId, attrs);
- TEST_EQUAL(TNodeStatus::OnDisk, attrs.m_status, ());
+ TEST_EQUAL(NodeStatus::OnDisk, attrs.m_status, ());
}
// Check there is only mwm files are present and no any other for the children nodes
@@ -226,15 +226,15 @@ void DeleteGroup(Storage & storage, bool oneByOne)
// Check state for the group node is set to UpToDate and NoError
NodeAttrs attrs;
storage.GetNodeAttrs(kGroupCountryId, attrs);
- TEST_EQUAL(TNodeStatus::NotDownloaded, attrs.m_status, ());
+ TEST_EQUAL(NodeStatus::NotDownloaded, attrs.m_status, ());
// Check state for the all children nodes is set to UpToDate and NoError
for (auto const & countryId : children)
{
- TEST_EQUAL(TStatus::ENotDownloaded, storage.CountryStatusEx(countryId), ());
+ TEST_EQUAL(Status::ENotDownloaded, storage.CountryStatusEx(countryId), ());
NodeAttrs attrs;
storage.GetNodeAttrs(countryId, attrs);
- TEST_EQUAL(TNodeStatus::NotDownloaded, attrs.m_status, ());
+ TEST_EQUAL(NodeStatus::NotDownloaded, attrs.m_status, ());
}
// Check there are no mwm files for the children nodes
diff --git a/storage/storage_integration_tests/storage_update_tests.cpp b/storage/storage_integration_tests/storage_update_tests.cpp
index a84be7050e..dc14d63d4e 100644
--- a/storage/storage_integration_tests/storage_update_tests.cpp
+++ b/storage/storage_integration_tests/storage_update_tests.cpp
@@ -113,7 +113,7 @@ UNIT_TEST(SmallMwms_Update_Test)
// Check group node status is EOnDisk
NodeAttrs attrs;
storage.GetNodeAttrs(kGroupCountryId, attrs);
- TEST_EQUAL(TNodeStatus::OnDisk, attrs.m_status, ());
+ TEST_EQUAL(NodeStatus::OnDisk, attrs.m_status, ());
// Check mwm files for version 1 are present
for (auto const & child : children)
@@ -147,14 +147,14 @@ UNIT_TEST(SmallMwms_Update_Test)
// Check group node status is EOnDiskOutOfDate
NodeAttrs attrs;
storage.GetNodeAttrs(kGroupCountryId, attrs);
- TEST_EQUAL(TNodeStatus::OnDiskOutOfDate, attrs.m_status, ());
+ TEST_EQUAL(NodeStatus::OnDiskOutOfDate, attrs.m_status, ());
// Check children node status is EOnDiskOutOfDate
for (auto const & child : children)
{
NodeAttrs attrs;
storage.GetNodeAttrs(child, attrs);
- TEST_EQUAL(TNodeStatus::OnDiskOutOfDate, attrs.m_status, ());
+ TEST_EQUAL(NodeStatus::OnDiskOutOfDate, attrs.m_status, ());
}
// Check mwm files for version 1 are present
@@ -170,14 +170,14 @@ UNIT_TEST(SmallMwms_Update_Test)
// Check group node status is EOnDisk
storage.GetNodeAttrs(kGroupCountryId, attrs);
- TEST_EQUAL(TNodeStatus::OnDisk, attrs.m_status, ());
+ TEST_EQUAL(NodeStatus::OnDisk, attrs.m_status, ());
// Check children node status is EOnDisk
for (auto const & child : children)
{
NodeAttrs attrs;
storage.GetNodeAttrs(child, attrs);
- TEST_EQUAL(TNodeStatus::OnDisk, attrs.m_status, ());
+ TEST_EQUAL(NodeStatus::OnDisk, attrs.m_status, ());
}
// Check mwm files for version 2 are present and not present for version 1