X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fclosed_caption_test.cc;h=b50430d4819e6e3a51b26560183e31f36ff95ac5;hb=20c70c93a38551842721ddee2e08c7b33a7bb924;hp=35abf1b02c5a14f5d80f8815329967f7588d1a0a;hpb=1db0293ad36605da9ca8daa8736ef581f4f6a34e;p=dcpomatic.git

diff --git a/test/closed_caption_test.cc b/test/closed_caption_test.cc
index 35abf1b02..b50430d48 100644
--- a/test/closed_caption_test.cc
+++ b/test/closed_caption_test.cc
@@ -25,15 +25,17 @@
 #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 std::list;
 using boost::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 ());
 
@@ -58,11 +60,11 @@ 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 ());
 
@@ -81,6 +83,19 @@ BOOST_AUTO_TEST_CASE (closed_caption_test2)
 
 	BOOST_REQUIRE_EQUAL (check.cpls().size(), 1);
 	BOOST_REQUIRE_EQUAL (check.cpls().front()->reels().size(), 1);
-	std::cout << !check.cpls().front()->reels().front()->closed_captions().size() << "\n";
-	BOOST_REQUIRE_EQUAL (!check.cpls().front()->reels().front()->closed_captions().size(), 3);
+	list<shared_ptr<dcp::ReelClosedCaptionAsset> > ccaps = check.cpls().front()->reels().front()->closed_captions();
+	BOOST_REQUIRE_EQUAL (ccaps.size(), 3);
+
+	list<shared_ptr<dcp::ReelClosedCaptionAsset> >::const_iterator i = ccaps.begin ();
+	BOOST_CHECK_EQUAL ((*i)->annotation_text(), "First track");
+	BOOST_REQUIRE (static_cast<bool>((*i)->language()));
+	BOOST_CHECK_EQUAL ((*i)->language().get(), "French");
+	++i;
+	BOOST_CHECK_EQUAL ((*i)->annotation_text(), "Second track");
+	BOOST_REQUIRE (static_cast<bool>((*i)->language()));
+	BOOST_CHECK_EQUAL ((*i)->language().get(), "German");
+	++i;
+	BOOST_CHECK_EQUAL ((*i)->annotation_text(), "Third track");
+	BOOST_REQUIRE (static_cast<bool>((*i)->language()));
+	BOOST_CHECK_EQUAL ((*i)->language().get(), "Italian");
 }