X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fclosed_caption_test.cc;h=31824b44393cf6d7f995db68da57e10bc28d722c;hb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8;hp=4074f8371318d7fabdb31c9c1270c8fec017da7f;hpb=ec97893127a2d59871d92c9e658b6b1ab3100b40;p=dcpomatic.git

diff --git a/test/closed_caption_test.cc b/test/closed_caption_test.cc
index 4074f8371..31824b443 100644
--- a/test/closed_caption_test.cc
+++ b/test/closed_caption_test.cc
@@ -25,19 +25,21 @@
 #include <dcp/dcp.h>
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
+#include <dcp/reel_closed_caption_asset.h>
 #include <boost/test/unit_test.hpp>
 
-using boost::shared_ptr;
+using std::list;
+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 (film, "test/data/subrip.srt"));
+	shared_ptr<StringTextFileContent> content (new StringTextFileContent("test/data/subrip.srt"));
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
-	content->only_text()->set_type (TEXT_CLOSED_CAPTION);
+	content->only_text()->set_type (TextType::CLOSED_CAPTION);
 
 	film->make_dcp ();
 	BOOST_REQUIRE (!wait_for_jobs ());
@@ -49,8 +51,8 @@ BOOST_AUTO_TEST_CASE (closed_caption_test1)
 	dcp::DCP check (film->dir(film->dcp_name()));
 	check.read ();
 
-	BOOST_REQUIRE_EQUAL (check.cpls().size(), 1);
-	BOOST_REQUIRE_EQUAL (check.cpls().front()->reels().size(), 1);
+	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());
 }
 
@@ -58,20 +60,20 @@ BOOST_AUTO_TEST_CASE (closed_caption_test1)
 BOOST_AUTO_TEST_CASE (closed_caption_test2)
 {
 	shared_ptr<Film> film = new_test_film2 ("closed_caption_test2");
-	shared_ptr<StringTextFileContent> content1 (new StringTextFileContent (film, "test/data/subrip.srt"));
+	shared_ptr<StringTextFileContent> content1 (new StringTextFileContent("test/data/subrip.srt"));
 	film->examine_and_add_content (content1);
-	shared_ptr<StringTextFileContent> content2 (new StringTextFileContent (film, "test/data/subrip2.srt"));
+	shared_ptr<StringTextFileContent> content2 (new StringTextFileContent("test/data/subrip2.srt"));
 	film->examine_and_add_content (content2);
-	shared_ptr<StringTextFileContent> content3 (new StringTextFileContent (film, "test/data/subrip3.srt"));
+	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);
-	content1->only_text()->set_dcp_track (DCPTextTrack("First track", "French"));
-	content2->only_text()->set_type (TEXT_CLOSED_CAPTION);
-	content2->only_text()->set_dcp_track (DCPTextTrack("Second track", "German"));
-	content3->only_text()->set_type (TEXT_CLOSED_CAPTION);
-	content3->only_text()->set_dcp_track (DCPTextTrack("Third track", "Italian"));
+	content1->only_text()->set_type (TextType::CLOSED_CAPTION);
+	content1->only_text()->set_dcp_track (DCPTextTrack("First track", "fr-FR"));
+	content2->only_text()->set_type (TextType::CLOSED_CAPTION);
+	content2->only_text()->set_dcp_track (DCPTextTrack("Second track", "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 ());
@@ -79,7 +81,21 @@ BOOST_AUTO_TEST_CASE (closed_caption_test2)
 	dcp::DCP check (film->dir(film->dcp_name()));
 	check.read ();
 
-	BOOST_REQUIRE_EQUAL (check.cpls().size(), 1);
-	BOOST_REQUIRE_EQUAL (check.cpls().front()->reels().size(), 1);
-	BOOST_REQUIRE_EQUAL (!check.cpls().front()->reels().front()->closed_captions().size(), 3);
+	BOOST_REQUIRE_EQUAL (check.cpls().size(), 1U);
+	BOOST_REQUIRE_EQUAL (check.cpls().front()->reels().size(), 1U);
+	auto ccaps = check.cpls().front()->reels().front()->closed_captions();
+	BOOST_REQUIRE_EQUAL (ccaps.size(), 3U);
+
+	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");
+	++i;
+	BOOST_CHECK_EQUAL ((*i)->annotation_text(), "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_REQUIRE (static_cast<bool>((*i)->language()));
+	BOOST_CHECK_EQUAL ((*i)->language().get(), "it-IT");
 }