From eb821b1574e4677f32b50f3093571d33fb3947c9 Mon Sep 17 00:00:00 2001 From: vng Date: Wed, 11 Nov 2015 16:39:19 +0300 Subject: [PATCH] [tests] Delete *.mwm.tmp files in generator testing. --- generator/feature_generator.hpp | 2 ++ .../test_mwm_builder.cpp | 22 +++++++++++++------ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/generator/feature_generator.hpp b/generator/feature_generator.hpp index 02cf8138a5..7d82086846 100644 --- a/generator/feature_generator.hpp +++ b/generator/feature_generator.hpp @@ -38,6 +38,8 @@ public: FeaturesCollector(string const & fName); virtual ~FeaturesCollector(); + string const & GetFilePath() const { return m_datFile.GetName(); } + virtual void operator()(FeatureBuilder1 const & f); }; diff --git a/generator/generator_tests_support/test_mwm_builder.cpp b/generator/generator_tests_support/test_mwm_builder.cpp index 5eb0f856eb..0ba33c519c 100644 --- a/generator/generator_tests_support/test_mwm_builder.cpp +++ b/generator/generator_tests_support/test_mwm_builder.cpp @@ -12,6 +12,8 @@ #include "platform/local_country_file.hpp" +#include "coding/internal/file_data.hpp" + #include "base/logging.hpp" #include "defines.hpp" @@ -29,7 +31,6 @@ TestMwmBuilder::~TestMwmBuilder() { if (m_collector) Finish(); - CHECK(!m_collector, ("Features weren't dumped on disk.")); } void TestMwmBuilder::AddPOI(m2::PointD const & p, string const & name, string const & lang) @@ -56,20 +57,27 @@ bool TestMwmBuilder::Add(FeatureBuilder1 & fb) void TestMwmBuilder::Finish() { + string const tmpFilePath = m_collector->GetFilePath(); + 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(), feature::DataHeader::country), ("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)), - ("Can't build geometry index.")); - CHECK(indexer::BuildSearchIndexFromDatFile(m_file.GetPath(MapOptions::Map), - true /* forceRebuild */), + + CHECK(my::DeleteFileX(tmpFilePath), ()); + + string const mapFilePath = m_file.GetPath(MapOptions::Map); + CHECK(feature::BuildOffsetsTable(mapFilePath), ("Can't build feature offsets table.")); + + CHECK(indexer::BuildIndexFromDatFile(mapFilePath, mapFilePath), ("Can't build geometry index.")); + + CHECK(indexer::BuildSearchIndexFromDatFile(mapFilePath, true /* forceRebuild */), ("Can't build search index.")); + m_file.SyncWithDisk(); }