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:
authorConstantin Shalnev <c.shalnev@corp.mail.ru>2016-01-25 15:05:04 +0300
committerSergey Yershov <yershov@corp.mail.ru>2016-03-23 16:15:18 +0300
commit385916562244a04af73b893a0d598b34cc0369bb (patch)
tree4052342c1860685447274b860acceabb8313418a /platform
parentf40c89b4b1fdf718285c3b83d62e297264b027c3 (diff)
[old-map-downloader] Fixed platform test: LocalCountryFile_DiskFiles
Diffstat (limited to 'platform')
-rw-r--r--platform/platform_tests/local_country_file_tests.cpp53
1 files changed, 34 insertions, 19 deletions
diff --git a/platform/platform_tests/local_country_file_tests.cpp b/platform/platform_tests/local_country_file_tests.cpp
index e0689f7ee5..939f7c35e8 100644
--- a/platform/platform_tests/local_country_file_tests.cpp
+++ b/platform/platform_tests/local_country_file_tests.cpp
@@ -3,6 +3,7 @@
#include "platform/country_file.hpp"
#include "platform/local_country_file.hpp"
#include "platform/local_country_file_utils.hpp"
+#include "platform/mwm_version.hpp"
#include "platform/platform.hpp"
#include "platform/platform_tests_support/scoped_dir.hpp"
#include "platform/platform_tests_support/scoped_file.hpp"
@@ -109,27 +110,41 @@ UNIT_TEST(LocalCountryFile_DiskFiles)
ScopedFile testMapFile(countryFile.GetNameWithExt(MapOptions::Map), "map");
localFile.SyncWithDisk();
- TEST(localFile.OnDisk(MapOptions::Map), ());
- TEST(!localFile.OnDisk(MapOptions::CarRouting), ());
- TEST(!localFile.OnDisk(MapOptions::MapWithCarRouting), ());
- TEST_EQUAL(3, localFile.GetSize(MapOptions::Map), ());
+ if (version::IsSingleMwm(localFile.GetVersion()))
+ {
+ TEST(localFile.OnDisk(MapOptions::Map), ());
+ TEST(localFile.OnDisk(MapOptions::CarRouting), ());
+ TEST(localFile.OnDisk(MapOptions::MapWithCarRouting), ());
+ TEST_EQUAL(3, localFile.GetSize(MapOptions::Map), ());
+
+ localFile.DeleteFromDisk(MapOptions::MapWithCarRouting);
+ TEST(!testMapFile.Exists(), (testMapFile, "wasn't deleted by LocalCountryFile."));
+ testMapFile.Reset();
+ }
+ else
+ {
+ TEST(localFile.OnDisk(MapOptions::Map), ());
+ TEST(!localFile.OnDisk(MapOptions::CarRouting), ());
+ TEST(!localFile.OnDisk(MapOptions::MapWithCarRouting), ());
+ TEST_EQUAL(3, localFile.GetSize(MapOptions::Map), ());
- ScopedFile testRoutingFile(countryFile.GetNameWithExt(MapOptions::CarRouting), "routing");
+ ScopedFile testRoutingFile(countryFile.GetNameWithExt(MapOptions::CarRouting), "routing");
- localFile.SyncWithDisk();
- TEST(localFile.OnDisk(MapOptions::Map), ());
- TEST(localFile.OnDisk(MapOptions::CarRouting), ());
- TEST(localFile.OnDisk(MapOptions::MapWithCarRouting), ());
- TEST_EQUAL(3, localFile.GetSize(MapOptions::Map), ());
- TEST_EQUAL(7, localFile.GetSize(MapOptions::CarRouting), ());
- TEST_EQUAL(10, localFile.GetSize(MapOptions::MapWithCarRouting), ());
-
- localFile.DeleteFromDisk(MapOptions::MapWithCarRouting);
- TEST(!testMapFile.Exists(), (testMapFile, "wasn't deleted by LocalCountryFile."));
- testMapFile.Reset();
-
- TEST(!testRoutingFile.Exists(), (testRoutingFile, "wasn't deleted by LocalCountryFile."));
- testRoutingFile.Reset();
+ localFile.SyncWithDisk();
+ TEST(localFile.OnDisk(MapOptions::Map), ());
+ TEST(localFile.OnDisk(MapOptions::CarRouting), ());
+ TEST(localFile.OnDisk(MapOptions::MapWithCarRouting), ());
+ TEST_EQUAL(3, localFile.GetSize(MapOptions::Map), ());
+ TEST_EQUAL(7, localFile.GetSize(MapOptions::CarRouting), ());
+ TEST_EQUAL(10, localFile.GetSize(MapOptions::MapWithCarRouting), ());
+
+ localFile.DeleteFromDisk(MapOptions::MapWithCarRouting);
+ TEST(!testMapFile.Exists(), (testMapFile, "wasn't deleted by LocalCountryFile."));
+ testMapFile.Reset();
+
+ TEST(!testRoutingFile.Exists(), (testRoutingFile, "wasn't deleted by LocalCountryFile."));
+ testRoutingFile.Reset();
+ }
}
UNIT_TEST(LocalCountryFile_CleanupMapFiles)