X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fburnt_subtitle_test.cc;h=0fffe4913e52bf76e96698e1e7724eda99502c2d;hb=3d9c0674236a425f0be5e9caff5e23f59e7c037a;hp=25ad3f66bd06bb512fc211412132e770b0b124b8;hpb=7ed0973eae4ed0a60595440faa54549ea88782c6;p=dcpomatic.git diff --git a/test/burnt_subtitle_test.cc b/test/burnt_subtitle_test.cc index 25ad3f66b..0fffe4913 100644 --- a/test/burnt_subtitle_test.cc +++ b/test/burnt_subtitle_test.cc @@ -66,8 +66,7 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_subrip) content->subtitle->set_burn (true); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs()); - film->make_dcp (); - BOOST_REQUIRE (!wait_for_jobs()); + make_and_verify_dcp (film); check_dcp ("test/data/burnt_subtitle_test_subrip", film->dir (film->dcp_name ())); } @@ -83,8 +82,7 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_dcp) content->subtitle->set_use (true); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs()); - film->make_dcp (); - BOOST_REQUIRE (!wait_for_jobs()); + make_and_verify_dcp (film); check_dcp ("test/data/burnt_subtitle_test_dcp", film->dir (film->dcp_name ())); } @@ -98,8 +96,7 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_onto_dcp) film->set_name ("frobozz"); film->examine_and_add_content (content_factory(film, "test/data/flat_black.png").front()); BOOST_REQUIRE (!wait_for_jobs()); - film->make_dcp (); - BOOST_REQUIRE (!wait_for_jobs()); + make_and_verify_dcp (film); Config::instance()->set_log_types (Config::instance()->log_types() | LogEntry::TYPE_DEBUG_ENCODE); auto film2 = new_test_film ("burnt_subtitle_test_onto_dcp2"); @@ -115,8 +112,7 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_onto_dcp) sub->subtitle->set_outline (true); film2->examine_and_add_content (sub); BOOST_REQUIRE (!wait_for_jobs()); - film2->make_dcp (); - BOOST_REQUIRE (!wait_for_jobs()); + make_and_verify_dcp (film2); BOOST_CHECK (background_dcp->position() == DCPTime()); BOOST_CHECK (sub->position() == DCPTime());