X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ffile_naming_test.cc;fp=test%2Ffile_naming_test.cc;h=1961bfcfe7676ccee975af87b359c736a6d8e079;hb=393d08d199c0b83a42a095bdd8eb3bb7573cd608;hp=4c29f1919de6ebf7ca91a9c39d55b6711b9a95b4;hpb=0abe9455791ac7c7c4d1e214d3be166ea5897493;p=dcpomatic.git

diff --git a/test/file_naming_test.cc b/test/file_naming_test.cc
index 4c29f1919..1961bfcfe 100644
--- a/test/file_naming_test.cc
+++ b/test/file_naming_test.cc
@@ -43,24 +43,6 @@ using std::make_shared;
 using std::string;
 
 
-class Keep
-{
-public:
-	Keep ()
-	{
-		_format = Config::instance()->dcp_asset_filename_format ();
-	}
-
-	~Keep ()
-	{
-		Config::instance()->set_dcp_asset_filename_format (_format);
-	}
-
-private:
-	dcp::NameFormat _format;
-};
-
-
 static
 string
 mxf_regex(string part) {
@@ -76,7 +58,7 @@ mxf_regex(string part) {
 
 BOOST_AUTO_TEST_CASE (file_naming_test)
 {
-	Keep k;
+	ConfigRestorer cr;
 	Config::instance()->set_dcp_asset_filename_format (dcp::NameFormat("%c"));
 
 	auto film = new_test_film ("file_naming_test");
@@ -129,7 +111,8 @@ BOOST_AUTO_TEST_CASE (file_naming_test)
 
 BOOST_AUTO_TEST_CASE (file_naming_test2)
 {
-	Keep k;
+	ConfigRestorer cr;
+
 	Config::instance()->set_dcp_asset_filename_format (dcp::NameFormat ("%c"));
 
 	auto film = new_test_film ("file_naming_test2");
@@ -187,7 +170,7 @@ BOOST_AUTO_TEST_CASE (file_naming_test2)
 
 BOOST_AUTO_TEST_CASE (subtitle_file_naming)
 {
-	Keep keep;
+	ConfigRestorer cr;
 
 	Config::instance()->set_dcp_asset_filename_format(dcp::NameFormat("%t ostrabagalous %c"));