From 12f0fc0503e958309b99ec492c6f5df32af41228 Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Tue, 30 Oct 2018 11:25:02 +0300 Subject: [PATCH] Using WritableDirChanger for camera tests. --- generator/generator_tests/intermediate_data_test.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/generator/generator_tests/intermediate_data_test.cpp b/generator/generator_tests/intermediate_data_test.cpp index b294efe66f..3cb6812f6e 100644 --- a/generator/generator_tests/intermediate_data_test.cpp +++ b/generator/generator_tests/intermediate_data_test.cpp @@ -11,6 +11,7 @@ #include "platform/platform.hpp" #include "platform/platform_tests_support/scoped_dir.hpp" #include "platform/platform_tests_support/scoped_file.hpp" +#include "platform/platform_tests_support/writable_dir_changer.hpp" #include "generator/camera_node_processor.hpp" #include "generator/generate_info.hpp" @@ -39,6 +40,7 @@ using namespace std; namespace { string const kSpeedCameraTag = ""; +string const kTestDir = "camera_generation_test"; void TestIntermediateData_SpeedCameraNodesToWays( string const & osmSourceXML, @@ -51,8 +53,7 @@ void TestIntermediateData_SpeedCameraNodesToWays( Platform & platform = GetPlatform(); - string const tmpDir = platform.TmpDir(); - platform.SetWritableDirForTests(tmpDir); + WritableDirChanger writableDirChanger(kTestDir); string const & writableDir = platform.WritableDir(); @@ -65,7 +66,7 @@ void TestIntermediateData_SpeedCameraNodesToWays( GenerateInfo genInfo; genInfo.m_intermediateDir = writableDir; genInfo.m_nodeStorageType = feature::GenerateInfo::NodeStorageType::Index; - genInfo.m_osmFileName = base::JoinPath(tmpDir, osmRelativePath); + genInfo.m_osmFileName = base::JoinPath(writableDir, osmRelativePath); genInfo.m_osmFileType = feature::GenerateInfo::OsmSourceType::XML; // Test save intermediate data is OK.