kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[old-map-downloader] Fixing part of tests.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2016-01-22 12:29:43 +03:00 • committed by Sergey Yershov
parent 02ea42fc4a
commit 508ea9a421
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
storage/storage_tests/queued_country_tests.cpp
View file

@ -8,7 +8,7 @@ namespace storage
UNIT_TEST(QueuedCountry_AddOptions)
{
Storage storage;
TIndex const index = storage.FindIndexByFile("USA_Georgia");
TIndex const index = storage.FindIndexByFile("Angola");
QueuedCountry country(index, MapOptions::CarRouting);
TEST_EQUAL(index, country.GetIndex(), ());
@ -31,7 +31,7 @@ UNIT_TEST(QueuedCountry_AddOptions)
UNIT_TEST(QueuedCountry_RemoveOptions)
{
Storage storage;
TIndex const index = storage.FindIndexByFile("USA_Georgia");
TIndex const index = storage.FindIndexByFile("Angola");
{
QueuedCountry country(index, MapOptions::MapWithCarRouting);
@ -93,7 +93,7 @@ UNIT_TEST(QueuedCountry_RemoveOptions)
UNIT_TEST(QueuedCountry_Bits)
{
Storage storage;
TIndex const index = storage.FindIndexByFile("USA_Georgia");
TIndex const index = storage.FindIndexByFile("Angola");
QueuedCountry country(index, MapOptions::MapWithCarRouting);
TEST_EQUAL(MapOptions::Nothing, country.GetDownloadedFiles(), ());

16
storage/storage_tests/storage_tests.cpp
View file

@ -328,10 +328,10 @@ UNIT_TEST(StorageTest_Smoke)
{
Storage storage;
TIndex const usaGeorgiaIndex = storage.FindIndexByFile("USA_Georgia");
TIndex const usaGeorgiaIndex = storage.FindIndexByFile("US_Georgia_North");
TEST(usaGeorgiaIndex.IsValid(), ());
CountryFile usaGeorgiaFile = storage.GetCountryFile(usaGeorgiaIndex);
TEST_EQUAL(usaGeorgiaFile.GetNameWithExt(MapOptions::Map), "USA_Georgia" DATA_FILE_EXTENSION,
TEST_EQUAL(usaGeorgiaFile.GetNameWithExt(MapOptions::Map), "US_Georgia_North" DATA_FILE_EXTENSION,
());
TIndex const georgiaIndex = storage.FindIndexByFile("Georgia");
@ -349,7 +349,7 @@ UNIT_TEST(StorageTest_SingleCountryDownloading)
TaskRunner runner;
InitStorage(storage, runner);
TIndex const azerbaijanIndex = storage.FindIndexByFile("Azerbaijan");
TIndex const azerbaijanIndex = storage.FindIndexByFile("Angola");
TEST(azerbaijanIndex.IsValid(), ());
CountryFile azerbaijanFile = storage.GetCountryFile(azerbaijanIndex);
@ -380,13 +380,13 @@ UNIT_TEST(StorageTest_TwoCountriesDownloading)
TaskRunner runner;
InitStorage(storage, runner);
TIndex const uruguayIndex = storage.FindIndexByFile("Uruguay");
TIndex const uruguayIndex = storage.FindIndexByFile("Yemen");
TEST(uruguayIndex.IsValid(), ());
storage.DeleteCountry(uruguayIndex, MapOptions::Map);
MY_SCOPE_GUARD(cleanupUruguayFiles,
bind(&Storage::DeleteCountry, &storage, uruguayIndex, MapOptions::Map));
TIndex const venezuelaIndex = storage.FindIndexByFile("Venezuela");
TIndex const venezuelaIndex = storage.FindIndexByFile("Angola");
TEST(venezuelaIndex.IsValid(), ());
storage.DeleteCountry(venezuelaIndex, MapOptions::MapWithCarRouting);
MY_SCOPE_GUARD(cleanupVenezuelaFiles, bind(&Storage::DeleteCountry, &storage, venezuelaIndex,
@ -407,7 +407,7 @@ UNIT_TEST(StorageTest_DeleteTwoVersionsOfTheSameCountry)
storage.Init(&OnCountryDownloaded);
storage.RegisterAllLocalMaps();
TIndex const index = storage.FindIndexByFile("Azerbaijan");
TIndex const index = storage.FindIndexByFile("Angola");
TEST(index.IsValid(), ());
CountryFile const countryFile = storage.GetCountryFile(index);
@ -447,7 +447,7 @@ UNIT_TEST(StorageTest_DownloadCountryAndDeleteRoutingOnly)
TaskRunner runner;
InitStorage(storage, runner);
TIndex const index = storage.FindIndexByFile("Azerbaijan");
TIndex const index = storage.FindIndexByFile("Angola");
TEST(index.IsValid(), ());
storage.DeleteCountry(index, MapOptions::MapWithCarRouting);
@ -683,7 +683,7 @@ UNIT_TEST(StorageTest_FailedDownloading)
storage.SetDownloaderForTesting(make_unique<TestMapFilesDownloader>());
storage.SetCurrentDataVersionForTesting(1234);
TIndex const index = storage.FindIndexByFile("Uruguay");
TIndex const index = storage.FindIndexByFile("Angola");
CountryFile const countryFile = storage.GetCountryFile(index);
// To prevent interference from other tests and on other tests it's