Add some comments.

[dcpomatic.git] / test / file_naming_test.cc

diff --git a/test/file_naming_test.cc b/test/file_naming_test.cc
index bd7efb0d9895102937ce66687829171f27b93cd3..6b5b2020d77aba32120dee7e7264ba15526758b3 100644 (file)
--- a/test/file_naming_test.cc
+++ b/test/file_naming_test.cc
@@ -59,17 +59,17 @@ BOOST_AUTO_TEST_CASE (file_naming_test)
        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 (
@@ -98,17 +98,17 @@ BOOST_AUTO_TEST_CASE (file_naming_test2)
        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 (