From de5ce2e342d756b418bad01a5881ded91edbf011 Mon Sep 17 00:00:00 2001
From: Lev Dragunov <l.dragunov@corp.mail.ru>
Date: Tue, 26 Jan 2016 19:17:31 +0300
Subject: [PATCH] Routing mapping test fixes.

---
 routing/routing_mapping.cpp                   |  2 ++
 .../routing_tests/routing_mapping_test.cpp    | 20 ++++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/routing/routing_mapping.cpp b/routing/routing_mapping.cpp
index e3fc290b5c..6f249a8801 100644
--- a/routing/routing_mapping.cpp
+++ b/routing/routing_mapping.cpp
@@ -27,6 +27,8 @@ namespace
  */
 bool CheckMwmConsistency(LocalCountryFile const & localFile)
 {
+  if (localFile.GetPath(MapOptions::CarRouting) == localFile.GetPath(MapOptions::Map))
+    return true;
   ModelReaderPtr r1 = FilesContainerR(localFile.GetPath(MapOptions::CarRouting))
       .GetReader(VERSION_FILE_TAG);
   ReaderSrc src1(r1.GetPtr());
diff --git a/routing/routing_tests/routing_mapping_test.cpp b/routing/routing_tests/routing_mapping_test.cpp
index 313abf6250..2becb2fb08 100644
--- a/routing/routing_tests/routing_mapping_test.cpp
+++ b/routing/routing_tests/routing_mapping_test.cpp
@@ -26,13 +26,12 @@ class LocalFileGenerator
 public:
   LocalFileGenerator(string const & fileName)
       : m_countryFile(fileName),
-        m_testMapFile(m_countryFile.GetNameWithExt(MapOptions::Map), "map"),
-        m_testRoutingFile(m_countryFile.GetNameWithExt(MapOptions::CarRouting), "routing"),
+        m_testDataFile(m_countryFile.GetNameWithExt(MapOptions::CarRouting), "routing"),
         m_localFile(GetPlatform().WritableDir(), m_countryFile, 0 /* version */)
   {
     m_localFile.SyncWithDisk();
     TEST(m_localFile.OnDisk(MapOptions::MapWithCarRouting), ());
-    GenerateVersionSections(m_localFile);
+    GenerateNecessarySections(m_localFile);
 
     m_result = m_testSet.Register(m_localFile);
     TEST_EQUAL(m_result.second, MwmSet::RegResult::Success,
@@ -46,21 +45,18 @@ public:
   size_t GetNumRefs() { return m_result.first.GetInfo()->GetNumRefs(); }
 
 private:
-  void GenerateVersionSections(LocalCountryFile const & localFile)
+  void GenerateNecessarySections(LocalCountryFile const & localFile)
   {
-    FilesContainerW routingCont(localFile.GetPath(MapOptions::CarRouting));
-    // Write version for routing file that is equal to correspondent mwm file.
-    FilesContainerW mwmCont(localFile.GetPath(MapOptions::Map));
+    FilesContainerW dataCont(localFile.GetPath(MapOptions::CarRouting));
 
-    FileWriter w1 = routingCont.GetWriter(VERSION_FILE_TAG);
-    FileWriter w2 = mwmCont.GetWriter(VERSION_FILE_TAG);
+    FileWriter w1 = dataCont.GetWriter(VERSION_FILE_TAG);
     version::WriteVersion(w1, my::TodayAsYYMMDD());
-    version::WriteVersion(w2, my::TodayAsYYMMDD());
+    FileWriter w2 = dataCont.GetWriter(ROUTING_MATRIX_FILE_TAG);
+    w2.Write("smth", 4);
   }
 
   CountryFile m_countryFile;
-  ScopedFile m_testMapFile;
-  ScopedFile m_testRoutingFile;
+  ScopedFile m_testDataFile;
   LocalCountryFile m_localFile;
   TestMwmSet m_testSet;
   pair<MwmSet::MwmId, MwmSet::RegResult> m_result;