From d8d4225a3e488cf78438b80938aa18fd07d30a06 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 15 Dec 2019 22:59:36 +0100 Subject: Stop empty Font IDs in imported DCP subtitles making it into the output DCP (#1689). --- test/data | 2 +- test/dcp_subtitle_test.cc | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 38 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/data b/test/data index 50e6dbff6..22decb7dc 160000 --- a/test/data +++ b/test/data @@ -1 +1 @@ -Subproject commit 50e6dbff6088ce3c5c4f3fba7d80dff331c1373e +Subproject commit 22decb7dc169bbd838c60e3bda1e93f4251250bd diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc index 4b3d8fc97..64800c100 100644 --- a/test/dcp_subtitle_test.cc +++ b/test/dcp_subtitle_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2018 Carl Hetherington + Copyright (C) 2014-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -182,3 +182,39 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test4) doc.read_file (subtitle_file (film)); BOOST_REQUIRE_EQUAL (doc.node_children("LoadFont").size(), 1); } + +static +void +check_font_tags (list nodes) +{ + BOOST_FOREACH (cxml::NodePtr i, nodes) { + if (i->name() == "Font") { + BOOST_CHECK (!i->optional_string_attribute("Id") || i->string_attribute("Id") != ""); + } + check_font_tags (i->node_children()); + } +} + +/** Check that imported tags with empty IDs (or corresponding Font tags with empty IDs) + * are not passed through into the DCP. + */ +BOOST_AUTO_TEST_CASE (dcp_subtitle_test5) +{ + shared_ptr film = new_test_film2 ("dcp_subtitle_test5"); + film->set_interop (true); + + shared_ptr content (new DCPSubtitleContent("test/data/dcp_sub6.xml")); + film->examine_and_add_content (content); + BOOST_REQUIRE (!wait_for_jobs()); + + film->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); + film->write_metadata (); + + cxml::Document doc ("DCSubtitle"); + doc.read_file (subtitle_file(film)); + BOOST_REQUIRE_EQUAL (doc.node_children("LoadFont").size(), 1); + BOOST_CHECK (doc.node_children("LoadFont").front()->string_attribute("Id") != ""); + + check_font_tags (doc.node_children()); +} -- cgit v1.2.3