Several renamings in framework.

3 files changed, 9 insertions, 9 deletions

diff --git a/storage/storage_integration_tests/migrate_tests.cpp b/storage/storage_integration_tests/migrate_tests.cpp
index a836daf037..8fa928b53d 100644
--- a/storage/storage_integration_tests/migrate_tests.cpp
+++ b/storage/storage_integration_tests/migrate_tests.cpp
@@ -25,7 +25,7 @@ UNIT_TEST(StorageFastMigrationTests)
   WritableDirChanger writableDirChanger(kMapTestDir);
 
   Framework f;
-  auto & s = f.Storage();
+  auto & s = f.GetStorage();
 
   uint32_t version;
   TEST(settings::Get("LastMigration", version), ("LastMigration didn't set"));
@@ -44,13 +44,13 @@ UNIT_TEST(StorageMigrationTests)
   settings::Set("DisableFastMigrate", true);
 
   Framework f;
-  auto & s = f.Storage();
+  auto & s = f.GetStorage();
 
   auto statePrefetchChanged = [&](TCountryId const & id)
   {
-    Status const nextStatus = f.Storage().GetPrefetchStorage()->CountryStatusEx(id);
+    Status const nextStatus = f.GetStorage().GetPrefetchStorage()->CountryStatusEx(id);
     LOG_SHORT(LINFO, (id, "status :", nextStatus));
-    if (!f.Storage().GetPrefetchStorage()->IsDownloadInProgress())
+    if (!f.GetStorage().GetPrefetchStorage()->IsDownloadInProgress())
     {
       LOG_SHORT(LINFO, ("All prefetched. Ready to migrate."));
       testing::StopEventLoop();
@@ -59,7 +59,7 @@ UNIT_TEST(StorageMigrationTests)
 
   auto stateChanged = [&](TCountryId const & id)
   {
-    if (!f.Storage().IsDownloadInProgress())
+    if (!f.GetStorage().IsDownloadInProgress())
     {
       LOG_SHORT(LINFO, ("All downloaded. Check consistency."));
       testing::StopEventLoop();
@@ -87,7 +87,7 @@ UNIT_TEST(StorageMigrationTests)
     TEST(s.IsNodeDownloaded(countryId), (countryId));
 
   TEST_NOT_EQUAL(f.PreMigrate(curPos, statePrefetchChanged, progressChanged), kInvalidCountryId, ());
-  TEST(f.Storage().GetPrefetchStorage()->IsDownloadInProgress(), ("Empty queue"));
+  TEST(f.GetStorage().GetPrefetchStorage()->IsDownloadInProgress(), ("Empty queue"));
   // Wait for downloading complete.
   testing::RunEventLoop();
 
diff --git a/storage/storage_integration_tests/storage_3levels_tests.cpp b/storage/storage_integration_tests/storage_3levels_tests.cpp
index 4c575a66bd..6da1b1b1b0 100644
--- a/storage/storage_integration_tests/storage_3levels_tests.cpp
+++ b/storage/storage_integration_tests/storage_3levels_tests.cpp
@@ -40,7 +40,7 @@ UNIT_TEST(SmallMwms_3levels_Test)
   Platform & platform = GetPlatform();
 
   Framework f;
-  auto & storage = f.Storage();
+  auto & storage = f.GetStorage();
   string const version = strings::to_string(storage.GetCurrentDataVersion());
   TEST(version::IsSingleMwm(storage.GetCurrentDataVersion()), ());
 
diff --git a/storage/storage_integration_tests/storage_update_tests.cpp b/storage/storage_integration_tests/storage_update_tests.cpp
index c587340508..6aa2339076 100644
--- a/storage/storage_integration_tests/storage_update_tests.cpp
+++ b/storage/storage_integration_tests/storage_update_tests.cpp
@@ -88,7 +88,7 @@ UNIT_TEST(SmallMwms_Update_Test)
 
   {
     Framework f;
-    auto & storage = f.Storage();
+    auto & storage = f.GetStorage();
     string const version = strings::to_string(storage.GetCurrentDataVersion());
     TEST(version::IsSingleMwm(storage.GetCurrentDataVersion()), ());
     TEST_EQUAL(version, kMwmVersion1, ());
@@ -126,7 +126,7 @@ UNIT_TEST(SmallMwms_Update_Test)
 
   {
     Framework f;
-    auto & storage = f.Storage();
+    auto & storage = f.GetStorage();
     string const version = strings::to_string(storage.GetCurrentDataVersion());
     TEST(version::IsSingleMwm(storage.GetCurrentDataVersion()), ());
     TEST_EQUAL(version, kMwmVersion2, ());