X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fsrt_subtitle_test.cc;h=9354628678742c259606a5594f0f9701aaf0cd69;hb=37d2bf172e9061f24c874d5416bd3c8f9719c823;hp=cd4ce3a05079184c60b8ad95d9a6f1704fd621ff;hpb=ea63ad9560757e56505551db3bf2e1c31be5c76c;p=dcpomatic.git

diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc
index cd4ce3a05..935462867 100644
--- a/test/srt_subtitle_test.cc
+++ b/test/srt_subtitle_test.cc
@@ -25,22 +25,24 @@
  */
 
 
-#include "lib/film.h"
-#include "lib/string_text_file_content.h"
 #include "lib/dcp_content_type.h"
+#include "lib/film.h"
 #include "lib/font.h"
 #include "lib/ratio.h"
+#include "lib/string_text_file_content.h"
 #include "lib/text_content.h"
 #include "test.h"
-#include <boost/test/unit_test.hpp>
+#include <dcp/smpte_subtitle_asset.h>
+#include <dcp/subtitle_string.h>
 #include <boost/algorithm/string.hpp>
+#include <boost/test/unit_test.hpp>
 #include <list>
 
 
-using std::string;
 using std::list;
-using std::shared_ptr;
 using std::make_shared;
+using std::shared_ptr;
+using std::string;
 using namespace dcpomatic;
 
 
@@ -170,13 +172,14 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test5)
 	film->set_name ("frobozz");
 	film->set_interop (true);
 	film->set_sequence (false);
-	auto content = make_shared<StringTextFileContent>("test/data/subrip2.srt");
-	content->only_text()->set_use (true);
-	content->only_text()->set_burn (false);
-	film->examine_and_add_content (content);
-	film->examine_and_add_content (content);
-	BOOST_REQUIRE (!wait_for_jobs());
-	content->set_position (film, DCPTime());
+	for (auto i = 0; i < 2; ++i) {
+		auto content = make_shared<StringTextFileContent>("test/data/subrip2.srt");
+		content->only_text()->set_use (true);
+		content->only_text()->set_burn (false);
+		film->examine_and_add_content (content);
+		BOOST_REQUIRE (!wait_for_jobs());
+		content->set_position (film, DCPTime());
+	}
 	make_and_verify_dcp (film, {dcp::VerificationNote::Code::INVALID_STANDARD});
 
 	check_dcp ("test/data/xml_subtitle_test2", film->dir (film->dcp_name ()));
@@ -204,6 +207,47 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test6)
 }
 
 
+/** Test a case where a & in srt ended up in the SMPTE subtitle as &amp;amp */
+BOOST_AUTO_TEST_CASE(srt_subtitle_entity)
+{
+	std::ofstream srt("build/test/srt_subtitle_entity.srt");
+	srt << "1\n";
+	srt << "00:00:01,000 -> 00:00:10,000\n";
+	srt << "Hello & world\n";
+	srt.close();
+
+	auto content = make_shared<StringTextFileContent>("build/test/srt_subtitle_entity.srt");
+	auto film = new_test_film2("srt_subtitle_entity", { content });
+	film->set_interop(false);
+	content->only_text()->set_use(true);
+	content->only_text()->set_burn(false);
+	make_and_verify_dcp (
+		film,
+		{
+			dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE,
+			dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME,
+			dcp::VerificationNote::Code::MISSING_CPL_METADATA,
+			dcp::VerificationNote::Code::INVALID_SUBTITLE_DURATION,
+			dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING,
+		});
+
+	dcp::SMPTESubtitleAsset check(dcp_file(film, "sub_"));
+	auto subs = check.subtitles();
+	BOOST_REQUIRE_EQUAL(subs.size(), 1U);
+	auto sub = std::dynamic_pointer_cast<const dcp::SubtitleString>(subs[0]);
+	BOOST_REQUIRE(sub);
+	/* libdcp::SubtitleAsset gets the text from the XML with get_content(), which
+	 * resolves the 5 predefined entities & " < > ' so we shouldn't see any
+	 * entity here.
+	 */
+	BOOST_CHECK_EQUAL(sub->text(), "Hello & world");
+
+	/* It should be escaped in the raw XML though */
+	BOOST_REQUIRE(static_cast<bool>(check.raw_xml()));
+	BOOST_CHECK(check.raw_xml()->find("Hello &amp; world") != string::npos);
+}
+
+
 #if 0
 /* XXX: this is disabled; there is some difference in font rendering
    between the test machine and others.