From a615ba5e8616b054ab65a0762e09588ae44ff0e6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 13 Oct 2017 23:38:28 +0100 Subject: Don't corrupt dcp_asset_filename_format configuration option during the test. --- test/file_naming_test.cc | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'test') diff --git a/test/file_naming_test.cc b/test/file_naming_test.cc index 8951f8380..bd7efb0d9 100644 --- a/test/file_naming_test.cc +++ b/test/file_naming_test.cc @@ -34,8 +34,26 @@ using std::string; using boost::shared_ptr; +class Keep +{ +public: + Keep () + { + _format = Config::instance()->dcp_asset_filename_format (); + } + + ~Keep () + { + Config::instance()->set_dcp_asset_filename_format (_format); + } + +private: + dcp::NameFormat _format; +}; + BOOST_AUTO_TEST_CASE (file_naming_test) { + Keep k; Config::instance()->set_dcp_asset_filename_format (dcp::NameFormat ("%c")); shared_ptr film = new_test_film ("file_naming_test"); @@ -74,6 +92,7 @@ BOOST_AUTO_TEST_CASE (file_naming_test) BOOST_AUTO_TEST_CASE (file_naming_test2) { + Keep k; Config::instance()->set_dcp_asset_filename_format (dcp::NameFormat ("%c")); shared_ptr film = new_test_film ("file_naming_test2"); -- cgit v1.2.3