X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fclosed_caption_test.cc;h=2b80c812eba948008ad4cf86310e55c84cf38f55;hb=da908d815787cd0272c8bdeef40e1a4d2f6a29f8;hp=86666a44cc686386ca193af6c42a3a9c272e5010;hpb=3ea24566e4591c0160379a6bee97c5e62b60a028;p=dcpomatic.git

diff --git a/test/closed_caption_test.cc b/test/closed_caption_test.cc
index 86666a44c..2b80c812e 100644
--- a/test/closed_caption_test.cc
+++ b/test/closed_caption_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -29,20 +29,27 @@
 #include <boost/test/unit_test.hpp>
 
 using std::list;
-using boost::shared_ptr;
+using std::make_shared;
+using std::shared_ptr;
 
 /** Basic test that Interop closed captions are written */
 BOOST_AUTO_TEST_CASE (closed_caption_test1)
 {
-	shared_ptr<Film> film = new_test_film2 ("closed_caption_test1");
-	shared_ptr<StringTextFileContent> content (new StringTextFileContent("test/data/subrip.srt"));
-	film->examine_and_add_content (content);
-	BOOST_REQUIRE (!wait_for_jobs ());
+	Cleanup cl;
 
-	content->only_text()->set_type (TEXT_CLOSED_CAPTION);
+	auto content = make_shared<StringTextFileContent>("test/data/subrip.srt");
+	auto film = new_test_film2 ("closed_caption_test1", { content }, &cl);
 
-	film->make_dcp ();
-	BOOST_REQUIRE (!wait_for_jobs ());
+	content->only_text()->set_type (TextType::CLOSED_CAPTION);
+
+	make_and_verify_dcp (
+		film,
+		{
+			dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE,
+			dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME,
+			dcp::VerificationNote::Code::INVALID_CLOSED_CAPTION_LINE_LENGTH,
+			dcp::VerificationNote::Code::MISSING_CPL_METADATA
+		});
 
 	/* Just check to see that there's a CCAP in the CPL: this
 	   check could be better!
@@ -54,39 +61,45 @@ BOOST_AUTO_TEST_CASE (closed_caption_test1)
 	BOOST_REQUIRE_EQUAL (check.cpls().size(), 1U);
 	BOOST_REQUIRE_EQUAL (check.cpls().front()->reels().size(), 1U);
 	BOOST_REQUIRE (!check.cpls().front()->reels().front()->closed_captions().empty());
+
+	cl.run ();
 }
 
 /** Test multiple closed captions */
 BOOST_AUTO_TEST_CASE (closed_caption_test2)
 {
-	shared_ptr<Film> film = new_test_film2 ("closed_caption_test2");
-	shared_ptr<StringTextFileContent> content1 (new StringTextFileContent("test/data/subrip.srt"));
-	film->examine_and_add_content (content1);
-	shared_ptr<StringTextFileContent> content2 (new StringTextFileContent("test/data/subrip2.srt"));
-	film->examine_and_add_content (content2);
-	shared_ptr<StringTextFileContent> content3 (new StringTextFileContent("test/data/subrip3.srt"));
-	film->examine_and_add_content (content3);
-	BOOST_REQUIRE (!wait_for_jobs ());
-
-	content1->only_text()->set_type (TEXT_CLOSED_CAPTION);
+	Cleanup cl;
+	auto content1 = make_shared<StringTextFileContent>("test/data/subrip.srt");
+	auto content2 = make_shared<StringTextFileContent>("test/data/subrip2.srt");
+	auto content3 = make_shared<StringTextFileContent>("test/data/subrip3.srt");
+	auto film = new_test_film2 ("closed_caption_test2", { content1, content2, content3 }, &cl);
+
+	content1->only_text()->set_type (TextType::CLOSED_CAPTION);
 	content1->only_text()->set_dcp_track (DCPTextTrack("First track", "fr-FR"));
-	content2->only_text()->set_type (TEXT_CLOSED_CAPTION);
+	content2->only_text()->set_type (TextType::CLOSED_CAPTION);
 	content2->only_text()->set_dcp_track (DCPTextTrack("Second track", "de-DE"));
-	content3->only_text()->set_type (TEXT_CLOSED_CAPTION);
+	content3->only_text()->set_type (TextType::CLOSED_CAPTION);
 	content3->only_text()->set_dcp_track (DCPTextTrack("Third track", "it-IT"));
 
-	film->make_dcp ();
-	BOOST_REQUIRE (!wait_for_jobs ());
+	make_and_verify_dcp (
+		film,
+		{
+			dcp::VerificationNote::Code::INVALID_SUBTITLE_DURATION,
+			dcp::VerificationNote::Code::INVALID_CLOSED_CAPTION_LINE_LENGTH,
+			dcp::VerificationNote::Code::MISSING_CPL_METADATA,
+			dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME,
+		}
+		);
 
 	dcp::DCP check (film->dir(film->dcp_name()));
 	check.read ();
 
 	BOOST_REQUIRE_EQUAL (check.cpls().size(), 1U);
 	BOOST_REQUIRE_EQUAL (check.cpls().front()->reels().size(), 1U);
-	list<shared_ptr<dcp::ReelClosedCaptionAsset> > ccaps = check.cpls().front()->reels().front()->closed_captions();
+	auto ccaps = check.cpls().front()->reels().front()->closed_captions();
 	BOOST_REQUIRE_EQUAL (ccaps.size(), 3U);
 
-	list<shared_ptr<dcp::ReelClosedCaptionAsset> >::const_iterator i = ccaps.begin ();
+	auto i = ccaps.begin ();
 	BOOST_CHECK_EQUAL ((*i)->annotation_text(), "First track");
 	BOOST_REQUIRE (static_cast<bool>((*i)->language()));
 	BOOST_CHECK_EQUAL ((*i)->language().get(), "fr-FR");
@@ -98,4 +111,6 @@ BOOST_AUTO_TEST_CASE (closed_caption_test2)
 	BOOST_CHECK_EQUAL ((*i)->annotation_text(), "Third track");
 	BOOST_REQUIRE (static_cast<bool>((*i)->language()));
 	BOOST_CHECK_EQUAL ((*i)->language().get(), "it-IT");
+
+	cl.run ();
 }