From 7fcbddfac81b3f785bf985a7be5cf7e471a66122 Mon Sep 17 00:00:00 2001 From: vng Date: Wed, 14 Oct 2015 18:27:28 +0300 Subject: [PATCH] Factor out variable. --- search/search_tests_support/test_mwm_builder.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/search/search_tests_support/test_mwm_builder.cpp b/search/search_tests_support/test_mwm_builder.cpp index a290e115d3..8b8afc0796 100644 --- a/search/search_tests_support/test_mwm_builder.cpp +++ b/search/search_tests_support/test_mwm_builder.cpp @@ -48,18 +48,19 @@ void TestMwmBuilder::Finish() { CHECK(m_collector, ("Finish() already was called.")); m_collector.reset(); + feature::GenerateInfo info; info.m_targetDir = m_file.GetDirectory(); info.m_tmpDir = m_file.GetDirectory(); CHECK(GenerateFinalFeatures(info, m_file.GetCountryFile().GetNameWithoutExt(), m_type), ("Can't sort features.")); - CHECK(feature::BuildOffsetsTable(m_file.GetPath(MapOptions::Map)), ("Can't build feature offsets table.")); - CHECK(indexer::BuildIndexFromDatFile(m_file.GetPath(MapOptions::Map), - m_file.GetPath(MapOptions::Map)), + + string const path = m_file.GetPath(MapOptions::Map); + CHECK(indexer::BuildIndexFromDatFile(path, path), ("Can't build geometry index.")); - CHECK(indexer::BuildSearchIndexFromDatFile(m_file.GetPath(MapOptions::Map), - true /* forceRebuild */), + CHECK(indexer::BuildSearchIndexFromDatFile(path, true /* forceRebuild */), ("Can't build search index.")); + m_file.SyncWithDisk(); } } // namespace tests_support