Make the crop controls more like those on the v2.15.x branch

[dcpomatic.git] / test / srt_subtitle_test.cc

diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc
index 31a082015e0d9f4de66d78034cebd81d9fcbda1e..f2d6373926749a01226a5aa25d177c572b5c9d07 100644 (file)
--- a/test/srt_subtitle_test.cc
+++ b/test/srt_subtitle_test.cc
@@ -49,12 +49,12 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test)
        film->set_interop (false);
        shared_ptr<StringTextFileContent> content (new StringTextFileContent("test/data/subrip2.srt"));
        film->examine_and_add_content (content);
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        content->only_text()->set_use (true);
        content->only_text()->set_burn (false);
        film->make_dcp ();
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        /* Should be blank video with a subtitle MXF */
        check_dcp ("test/data/srt_subtitle_test", film->dir (film->dcp_name ()));
@@ -71,15 +71,15 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test2)
        film->set_interop (false);
        shared_ptr<StringTextFileContent> content (new StringTextFileContent ("test/data/subrip2.srt"));
        film->examine_and_add_content (content);
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        content->only_text()->set_use (true);
        content->only_text()->set_burn (false);
        /* Use test/data/subrip2.srt as if it were a font file  */
-       content->only_text()->fonts().front()->set_file (FontFiles::NORMAL, "test/data/subrip2.srt");
+       content->only_text()->fonts().front()->set_file("test/data/subrip2.srt");
 
        film->make_dcp ();
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        /* Should be blank video with a subtitle MXF */
        check_dcp ("test/data/srt_subtitle_test2", film->dir (film->dcp_name ()));
@@ -106,13 +106,13 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
        film->set_audio_channels (6);
        shared_ptr<StringTextFileContent> content (new StringTextFileContent(private_data / "Ankoemmling_short.srt"));
        film->examine_and_add_content (content);
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        content->only_text()->set_use (true);
        content->only_text()->set_burn (false);
 
        film->make_dcp ();
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        check_subtitle_file (film, private_data / "Ankoemmling_short.xml");
 }
@@ -129,9 +129,9 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test4)
        content->only_text()->set_use (true);
        content->only_text()->set_burn (false);
        film->examine_and_add_content (content);
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
        film->make_dcp ();
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        /* Should be blank video with MXF subtitles */
        check_dcp ("test/data/xml_subtitle_test", film->dir (film->dcp_name ()));
@@ -150,11 +150,15 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test5)
        content->only_text()->set_use (true);
        content->only_text()->set_burn (false);
        film->examine_and_add_content (content);
-       film->examine_and_add_content (content);
-       wait_for_jobs ();
+       shared_ptr<StringTextFileContent> content2 (new StringTextFileContent("test/data/subrip2.srt"));
+       content2->only_text()->set_use (true);
+       content2->only_text()->set_burn (false);
+       film->examine_and_add_content (content2);
+       BOOST_REQUIRE (!wait_for_jobs());
        content->set_position (film, DCPTime());
+       content2->set_position (film, DCPTime());
        film->make_dcp ();
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
        film->write_metadata ();
 
        check_dcp ("test/data/xml_subtitle_test2", film->dir (film->dcp_name ()));