AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[storage] Adding storage/storage_integration_tests/download_calc_size_test.cpp and fixing DownloadingTests_CalcOverallProgress().

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2019-12-05 15:23:01 +03:00 • committed by mpimenov
parent 8eaf9f862f
commit 3e7918b74f
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
storage/storage_integration_tests/CMakeLists.txt
View file

@ -5,6 +5,7 @@ add_definitions("-DOMIM_UNIT_TEST_WITH_QT_EVENT_LOOP")
set(
SRC
download_calc_size_test.cpp
lightweight_matching_tests.cpp
storage_3levels_tests.cpp
storage_downloading_tests.cpp

6
storage/storage_integration_tests/download_calc_size_test.cpp
View file

@ -24,7 +24,7 @@ void InitStorage(Storage & storage, Storage::UpdateCallback const & didDownload,
storage.Init(didDownload, [](CountryId const &, LocalFilePtr const) { return false; });
storage.RegisterAllLocalMaps(false /* enableDiffs */);
storage.Subscribe(changeCountryFunction, progress);
storage.SetDownloadingUrlsForTesting({kTestWebServer});
storage.SetDownloadingServersForTesting({kTestWebServer});
}
UNIT_TEST(DownloadingTests_CalcOverallProgress)
@ -36,7 +36,7 @@ UNIT_TEST(DownloadingTests_CalcOverallProgress)
Storage s;
s.SetDownloadingUrlsForTesting({storage::kTestWebServer});
s.SetDownloadingServersForTesting({storage::kTestWebServer});
MapFilesDownloader::Progress baseProgress = s.GetOverallProgress(kTestCountries);
TEST_EQUAL(baseProgress.first, 0, ());
@ -44,7 +44,7 @@ UNIT_TEST(DownloadingTests_CalcOverallProgress)
for (auto const &country : kTestCountries)
{
baseProgress.second += s.CountrySizeInBytes(country, MapOptions::Map).second;
baseProgress.second += s.CountrySizeInBytes(country).second;
}
auto progressChanged = [&s, &kTestCountries, &baseProgress](CountryId const & id,