Fill test disk partitions with random noise to expose more bugs.

[dcpomatic.git] / test / closed_caption_test.cc

diff --git a/test/closed_caption_test.cc b/test/closed_caption_test.cc
index cc2dca930e8457ab9eb2efd07f5a4f9e3492b65f..d1cb9c3e31b30069386ddb2ba665617764023d1c 100644 (file)
--- a/test/closed_caption_test.cc
+++ b/test/closed_caption_test.cc
@@ -37,15 +37,19 @@ BOOST_AUTO_TEST_CASE (closed_caption_test1)
 {
        Cleanup cl;
 
-       auto film = new_test_film2 ("closed_caption_test1", &cl);
        auto content = make_shared<StringTextFileContent>("test/data/subrip.srt");
-       film->examine_and_add_content (content);
-       BOOST_REQUIRE (!wait_for_jobs ());
+       auto film = new_test_film2 ("closed_caption_test1", { content }, &cl);
 
        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!
@@ -65,25 +69,27 @@ BOOST_AUTO_TEST_CASE (closed_caption_test1)
 BOOST_AUTO_TEST_CASE (closed_caption_test2)
 {
        Cleanup cl;
-
-       auto film = new_test_film2 ("closed_caption_test2", &cl);
        auto content1 = make_shared<StringTextFileContent>("test/data/subrip.srt");
-       film->examine_and_add_content (content1);
        auto content2 = make_shared<StringTextFileContent>("test/data/subrip2.srt");
-       film->examine_and_add_content (content2);
        auto content3 = make_shared<StringTextFileContent>("test/data/subrip3.srt");
-       film->examine_and_add_content (content3);
-       BOOST_REQUIRE (!wait_for_jobs ());
+       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"));
-
-       film->make_dcp ();
-       BOOST_REQUIRE (!wait_for_jobs ());
+       content3->only_text()->set_dcp_track (DCPTextTrack("Third track", dcp::LanguageTag("it-IT")));
+
+       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 ();
@@ -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");