X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ffile_naming_test.cc;h=6b5b2020d77aba32120dee7e7264ba15526758b3;hb=fe75e35f36fb827c9abfeb0a2e9670f8a77ba54e;hp=f4235dec24d76dc375e80cba914e69f524d6a621;hpb=ab32017c7cc918ddd2cd35661cf64985e0abc79a;p=dcpomatic.git

diff --git a/test/file_naming_test.cc b/test/file_naming_test.cc
index f4235dec2..6b5b2020d 100644
--- a/test/file_naming_test.cc
+++ b/test/file_naming_test.cc
@@ -18,6 +18,11 @@
 
 */
 
+/** @file  test/file_naming_test.cc
+ *  @brief Test how files in DCPs are named.
+ *  @ingroup specific
+ */
+
 #include "test.h"
 #include "lib/config.h"
 #include "lib/film.h"
@@ -29,24 +34,42 @@
 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> film = new_test_film ("file_naming_test");
 	film->set_name ("file_naming_test");
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
-	shared_ptr<FFmpegContent> r (new FFmpegContent (film, "test/data/flat_red.png"));
+	shared_ptr<FFmpegContent> r (new FFmpegContent("test/data/flat_red.png"));
 	film->examine_and_add_content (r);
-	shared_ptr<FFmpegContent> g (new FFmpegContent (film, "test/data/flat_green.png"));
+	shared_ptr<FFmpegContent> g (new FFmpegContent("test/data/flat_green.png"));
 	film->examine_and_add_content (g);
-	shared_ptr<FFmpegContent> b (new FFmpegContent (film, "test/data/flat_blue.png"));
+	shared_ptr<FFmpegContent> b (new FFmpegContent("test/data/flat_blue.png"));
 	film->examine_and_add_content (b);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
 	film->make_dcp ();
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	int got[3] = { 0, 0, 0 };
 	for (
@@ -69,22 +92,23 @@ 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> film = new_test_film ("file_naming_test2");
 	film->set_name ("file_naming_test2");
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
-	shared_ptr<FFmpegContent> r (new FFmpegContent (film, "test/data/flät_red.png"));
+	shared_ptr<FFmpegContent> r (new FFmpegContent("test/data/flät_red.png"));
 	film->examine_and_add_content (r);
-	shared_ptr<FFmpegContent> g (new FFmpegContent (film, "test/data/flat_green.png"));
+	shared_ptr<FFmpegContent> g (new FFmpegContent("test/data/flat_green.png"));
 	film->examine_and_add_content (g);
-	shared_ptr<FFmpegContent> b (new FFmpegContent (film, "test/data/flat_blue.png"));
+	shared_ptr<FFmpegContent> b (new FFmpegContent("test/data/flat_blue.png"));
 	film->examine_and_add_content (b);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
 	film->make_dcp ();
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	int got[3] = { 0, 0, 0 };
 	for (