X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdcp_subtitle_test.cc;h=34059a680bba3f0a0892592828333751f2f9afd7;hb=2268783ea44e97e118d6fd164618fcf736563e29;hp=d45ac603e4961c433fc2d72e8f40d938ed857105;hpb=0cb31de2be2b51a8bc19e55ceb1b86dc26ea1c42;p=dcpomatic.git

diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index d45ac603e..34059a680 100644
--- a/test/dcp_subtitle_test.cc
+++ b/test/dcp_subtitle_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -29,6 +29,7 @@
 #include "lib/ratio.h"
 #include "lib/dcp_decoder.h"
 #include "lib/dcp_content_type.h"
+#include "lib/dcp_subtitle_decoder.h"
 #include "lib/subtitle_content.h"
 #include "lib/content_subtitle.h"
 #include "lib/subtitle_decoder.h"
@@ -50,7 +51,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test)
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
-	BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds (2));
+	BOOST_CHECK_EQUAL (content->full_length().get(), DCPTime::from_seconds(2).get());
 
 	content->subtitle->set_use (true);
 	content->subtitle->set_burn (false);
@@ -82,10 +83,10 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test)
 		);
 
 	BOOST_REQUIRE_EQUAL (ctp.size(), 2);
-	BOOST_CHECK_EQUAL (ctp.front().from, ContentTime::from_seconds (25 + 12 * 0.04));
-	BOOST_CHECK_EQUAL (ctp.front().to, ContentTime::from_seconds (26 + 4 * 0.04));
-	BOOST_CHECK_EQUAL (ctp.back().from, ContentTime::from_seconds (25 + 12 * 0.04));
-	BOOST_CHECK_EQUAL (ctp.back().to, ContentTime::from_seconds (26 + 4 * 0.04));
+	BOOST_CHECK_EQUAL (ctp.front().from.get(), ContentTime::from_seconds(25 + 12 * 0.04).get());
+	BOOST_CHECK_EQUAL (ctp.front().to.get(), ContentTime::from_seconds(26 + 4 * 0.04).get());
+	BOOST_CHECK_EQUAL (ctp.back().from.get(), ContentTime::from_seconds(25 + 12 * 0.04).get());
+	BOOST_CHECK_EQUAL (ctp.back().to.get(), ContentTime::from_seconds(26 + 4 * 0.04).get());
 
 	list<ContentTextSubtitle> subs = decoder->subtitle->get_text (
 		ContentTimePeriod (
@@ -101,3 +102,23 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test)
 	BOOST_CHECK_EQUAL (subs.front().subs.front().text(), "Noch mal.");
 	BOOST_CHECK_EQUAL (subs.front().subs.back().text(), "Encore une fois.");
 }
+
+/** Test subtitles whose text includes things like &lt;b&gt; */
+BOOST_AUTO_TEST_CASE (dcp_subtitle_test2)
+{
+	shared_ptr<Film> film = new_test_film ("dcp_subtitle_test2");
+	film->set_container (Ratio::from_id ("185"));
+	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
+	film->set_name ("frobozz");
+	shared_ptr<DCPSubtitleContent> content (new DCPSubtitleContent (film, "test/data/dcp_sub2.xml"));
+	film->examine_and_add_content (content);
+	wait_for_jobs ();
+
+	shared_ptr<DCPSubtitleDecoder> decoder (new DCPSubtitleDecoder (content));
+	list<ContentTextSubtitle> sub = decoder->subtitle->get_text (
+		ContentTimePeriod (ContentTime::from_seconds(0), ContentTime::from_seconds(2)), true, true
+		);
+	BOOST_REQUIRE_EQUAL (sub.size(), 1);
+	BOOST_REQUIRE_EQUAL (sub.front().subs.size(), 1);
+	BOOST_CHECK_EQUAL (sub.front().subs.front().text(), "&lt;b&gt;Hello world!&lt;/b&gt;");
+}