diff options
| author | Yuri Gorshenin <y@mmaps.me> | 2015-03-30 14:26:48 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:41:35 +0300 |
| commit | 25f7a7f2f32cc4db8a5bd0106ae4c8f6c6292201 (patch) | |
| tree | be1b14a86fe2f34445e488c128eaad7b1d0aeece /map/mwm_tests | |
| parent | f6bba24d00706065ddacf7e983fc4cf9ede8b7ab (diff) | |
Review fixes.
Diffstat (limited to 'map/mwm_tests')
| -rw-r--r-- | map/mwm_tests/multithread_mwm_test.cpp | 4 | ||||
| -rw-r--r-- | map/mwm_tests/mwm_foreach_test.cpp | 4 | ||||
| -rw-r--r-- | map/mwm_tests/mwm_index_test.cpp | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/map/mwm_tests/multithread_mwm_test.cpp b/map/mwm_tests/multithread_mwm_test.cpp index ea5b9706e5..83b387e4cd 100644 --- a/map/mwm_tests/multithread_mwm_test.cpp +++ b/map/mwm_tests/multithread_mwm_test.cpp @@ -62,7 +62,9 @@ namespace { SourceT src; src.InitClassificator(); - src.RegisterMap(file + DATA_FILE_EXTENSION); + + feature::DataHeader::Version version; + src.RegisterMap(file + DATA_FILE_EXTENSION, version); // Check that country rect is valid and not infinity. m2::RectD const r = src.GetWorldRect(); diff --git a/map/mwm_tests/mwm_foreach_test.cpp b/map/mwm_tests/mwm_foreach_test.cpp index 15c2544299..a6ee0375e3 100644 --- a/map/mwm_tests/mwm_foreach_test.cpp +++ b/map/mwm_tests/mwm_foreach_test.cpp @@ -250,7 +250,9 @@ void RunTest(string const & file) { model::FeaturesFetcher src1; src1.InitClassificator(); - src1.RegisterMap(file); + + feature::DataHeader::Version version; + src1.RegisterMap(file, version); vector<m2::RectD> rects; rects.push_back(src1.GetWorldRect()); diff --git a/map/mwm_tests/mwm_index_test.cpp b/map/mwm_tests/mwm_index_test.cpp index f162d4c39b..a0ad429bf0 100644 --- a/map/mwm_tests/mwm_index_test.cpp +++ b/map/mwm_tests/mwm_index_test.cpp @@ -39,7 +39,8 @@ public: bool RunTest(string const & fileName, int lowS, int highS) { model::FeaturesFetcher src; - if (src.RegisterMap(fileName) == -1) + feature::DataHeader::Version version; + if (!src.RegisterMap(fileName, version) || version == feature::DataHeader::unknownVersion) return false; CheckNonEmptyGeometry doCheck; @@ -52,7 +53,6 @@ bool RunTest(string const & fileName, int lowS, int highS) return true; } - } UNIT_TEST(ForEachFeatureID_Test) |