summaryrefslogtreecommitdiff
path: root/test/subtitle_reel_test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-02-26 01:24:48 +0100
committerCarl Hetherington <cth@carlh.net>2021-02-26 01:24:48 +0100
commitea63ad9560757e56505551db3bf2e1c31be5c76c (patch)
treeec0f539b89d9c8ac627e65886241cc086246ab09 /test/subtitle_reel_test.cc
parentcbb8260e395058da76b3de518ebc535a114c54b1 (diff)
More verification of DCPs during tests.
Diffstat (limited to 'test/subtitle_reel_test.cc')
-rw-r--r--test/subtitle_reel_test.cc20
1 files changed, 14 insertions, 6 deletions
diff --git a/test/subtitle_reel_test.cc b/test/subtitle_reel_test.cc
index c910d4aec..e56f9664a 100644
--- a/test/subtitle_reel_test.cc
+++ b/test/subtitle_reel_test.cc
@@ -67,8 +67,7 @@ BOOST_AUTO_TEST_CASE (subtitle_reel_test)
film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
- film->make_dcp ();
- BOOST_REQUIRE (!wait_for_jobs());
+ make_and_verify_dcp (film, {dcp::VerificationNote::Code::INVALID_STANDARD});
dcp::DCP dcp ("build/test/subtitle_reel_test/" + film->dcp_name());
dcp.read ();
@@ -116,8 +115,13 @@ BOOST_AUTO_TEST_CASE (subtitle_in_all_reels_test)
auto subs = content_factory("test/data/15s.srt").front();
film->examine_and_add_content (subs);
BOOST_REQUIRE (!wait_for_jobs());
- film->make_dcp ();
- BOOST_REQUIRE (!wait_for_jobs());
+ make_and_verify_dcp (
+ film,
+ {
+ dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE,
+ dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME,
+ dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING
+ });
dcp::DCP dcp ("build/test/subtitle_in_all_reels_test/" + film->dcp_name());
dcp.read ();
@@ -161,8 +165,12 @@ BOOST_AUTO_TEST_CASE (closed_captions_in_all_reels_test)
ccap2->text.front()->set_type (TextType::CLOSED_CAPTION);
ccap2->text.front()->set_dcp_track (DCPTextTrack("Other", "en-GB"));
- film->make_dcp ();
- BOOST_REQUIRE (!wait_for_jobs());
+ make_and_verify_dcp (
+ film,
+ {
+ dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME,
+ dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING
+ });
dcp::DCP dcp ("build/test/closed_captions_in_all_reels_test/" + film->dcp_name());
dcp.read ();