X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fclosed_caption_test.cc;h=d1cb9c3e31b30069386ddb2ba665617764023d1c;hb=b915348a8288d68e2ff114fb3dd89ad22e699969;hp=b5b13e040eda7bd88e795298fc97a1e4fdd46ce0;hpb=95d254b704d3d3ca74e2948edaa058e81d565c7b;p=dcpomatic.git

diff --git a/test/closed_caption_test.cc b/test/closed_caption_test.cc
index b5b13e040..d1cb9c3e3 100644
--- a/test/closed_caption_test.cc
+++ b/test/closed_caption_test.cc
@@ -42,8 +42,14 @@ BOOST_AUTO_TEST_CASE (closed_caption_test1)
 
 	content->only_text()->set_type (TextType::CLOSED_CAPTION);
 
-	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_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!
@@ -69,11 +75,11 @@ BOOST_AUTO_TEST_CASE (closed_caption_test2)
 	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"));
+	content1->only_text()->set_dcp_track (DCPTextTrack("First track", dcp::LanguageTag("fr-FR")));
 	content2->only_text()->set_type (TextType::CLOSED_CAPTION);
-	content2->only_text()->set_dcp_track (DCPTextTrack("Second track", "de-DE"));
+	content2->only_text()->set_dcp_track (DCPTextTrack("Second track", dcp::LanguageTag("de-DE")));
 	content3->only_text()->set_type (TextType::CLOSED_CAPTION);
-	content3->only_text()->set_dcp_track (DCPTextTrack("Third track", "it-IT"));
+	content3->only_text()->set_dcp_track (DCPTextTrack("Third track", dcp::LanguageTag("it-IT")));
 
 	make_and_verify_dcp (
 		film,
@@ -94,15 +100,15 @@ BOOST_AUTO_TEST_CASE (closed_caption_test2)
 	BOOST_REQUIRE_EQUAL (ccaps.size(), 3U);
 
 	auto i = ccaps.begin ();
-	BOOST_CHECK_EQUAL ((*i)->annotation_text(), "First track");
+	BOOST_CHECK_EQUAL ((*i)->annotation_text().get_value_or(""), "First track");
 	BOOST_REQUIRE (static_cast<bool>((*i)->language()));
 	BOOST_CHECK_EQUAL ((*i)->language().get(), "fr-FR");
 	++i;
-	BOOST_CHECK_EQUAL ((*i)->annotation_text(), "Second track");
+	BOOST_CHECK_EQUAL ((*i)->annotation_text().get_value_or(""), "Second track");
 	BOOST_REQUIRE (static_cast<bool>((*i)->language()));
 	BOOST_CHECK_EQUAL ((*i)->language().get(), "de-DE");
 	++i;
-	BOOST_CHECK_EQUAL ((*i)->annotation_text(), "Third track");
+	BOOST_CHECK_EQUAL ((*i)->annotation_text().get_value_or(""), "Third track");
 	BOOST_REQUIRE (static_cast<bool>((*i)->language()));
 	BOOST_CHECK_EQUAL ((*i)->language().get(), "it-IT");