Storage redesign.

1 files changed, 9 insertions, 7 deletions

diff --git a/generator/generator_tests/check_mwms.cpp b/generator/generator_tests/check_mwms.cpp
index b4771110ba..1ce869d62c 100644
--- a/generator/generator_tests/check_mwms.cpp
+++ b/generator/generator_tests/check_mwms.cpp
@@ -5,6 +5,8 @@
 #include "indexer/data_header.hpp"
 #include "indexer/interval_index.hpp"
 
+#include "platform/local_country_file.hpp"
+#include "platform/local_country_file_utils.hpp"
 #include "platform/platform.hpp"
 
 #include "base/logging.hpp"
@@ -12,25 +14,25 @@
 
 UNIT_TEST(CheckMWM_LoadAll)
 {
-  Platform & pl = GetPlatform();
-
-  Platform::FilesList maps;
-  pl.GetFilesByExt(pl.WritableDir(), DATA_FILE_EXTENSION, maps);
+  Platform & platform = GetPlatform();
+  vector<platform::LocalCountryFile> localFiles;
+  platform::FindAllLocalMapsInDirectory(platform.WritableDir(), 0 /* version */, localFiles);
 
   model::FeaturesFetcher m;
   m.InitClassificator();
 
-  for (string const & s : maps)
+  for (platform::LocalCountryFile const & localFile : localFiles)
   {
+    LOG(LINFO, ("Found mwm:", localFile));
     try
     {
-      pair<MwmSet::MwmLock, bool> const p = m.RegisterMap(s);
+      pair<MwmSet::MwmLock, bool> const p = m.RegisterMap(localFile);
       TEST(p.first.IsLocked(), ());
       TEST(p.second, ());
     }
     catch (RootException const & ex)
     {
-      TEST(false, ("Bad mwm file:", s));
+      TEST(false, ("Bad mwm file:", localFile));
     }
   }
 }