From 7a47f00a7ff3f95ef4013bf453340b94c8535e07 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 6 Apr 2023 22:32:14 +0200 Subject: Remove xmlns:xs namespace from subtitle XML (DoM #2498). --- test/data/2007.mxf | Bin 17287 -> 17243 bytes test/data/2010.mxf | Bin 17287 -> 17243 bytes test/data/2014.mxf | Bin 17287 -> 17243 bytes test/shared_subtitle_test.cc | 8 ++++---- test/smpte_subtitle_test.cc | 2 ++ test/verify_test.cc | 4 ++-- 6 files changed, 8 insertions(+), 6 deletions(-) (limited to 'test') diff --git a/test/data/2007.mxf b/test/data/2007.mxf index be085a9c..fafe7768 100644 Binary files a/test/data/2007.mxf and b/test/data/2007.mxf differ diff --git a/test/data/2010.mxf b/test/data/2010.mxf index 60f20108..29ba626d 100644 Binary files a/test/data/2010.mxf and b/test/data/2010.mxf differ diff --git a/test/data/2014.mxf b/test/data/2014.mxf index a757dc31..43d0cded 100644 Binary files a/test/data/2014.mxf and b/test/data/2014.mxf differ diff --git a/test/shared_subtitle_test.cc b/test/shared_subtitle_test.cc index 9c841f90..69ae2be4 100644 --- a/test/shared_subtitle_test.cc +++ b/test/shared_subtitle_test.cc @@ -51,10 +51,10 @@ #include -using std::string; +using std::make_shared; using std::shared_ptr; +using std::string; using std::vector; -using std::make_shared; using boost::optional; @@ -183,9 +183,9 @@ BOOST_AUTO_TEST_CASE (format_xml_test1) fred->add_child_text("Fred"); fred->add_child("Text")->add_child_text("Jim"); fred->add_child_text("Sheila"); - BOOST_REQUIRE_EQUAL (dcp::SubtitleAsset::format_xml(doc, { {"", "fred"}, {"jim", "sheila"} }), + BOOST_REQUIRE_EQUAL (dcp::SubtitleAsset::format_xml(doc, make_pair(string{}, string{"fred"})), "\n" -"\n" +"\n" " \n" " Hello world\n" " \n" diff --git a/test/smpte_subtitle_test.cc b/test/smpte_subtitle_test.cc index b271b02c..f66ca055 100644 --- a/test/smpte_subtitle_test.cc +++ b/test/smpte_subtitle_test.cc @@ -722,6 +722,8 @@ BOOST_AUTO_TEST_CASE(smpte_subtitle_standard_written_correctly) dcp::SMPTESubtitleAsset test_2014; test_2014.set_issue_date(dcp::LocalTime("2020-01-01T14:00:00")); test_2014.write(out / "2014.mxf"); + std::cout << dcp::SMPTESubtitleAsset(ref / "2014.mxf").raw_xml() << "\n"; + std::cout << dcp::SMPTESubtitleAsset(out / "2014.mxf").raw_xml() << "\n"; BOOST_CHECK(dcp::SMPTESubtitleAsset(ref / "2014.mxf").raw_xml() == dcp::SMPTESubtitleAsset(out / "2014.mxf").raw_xml()); dcp::SMPTESubtitleAsset test_2010(dcp::SubtitleStandard::SMPTE_2010); diff --git a/test/verify_test.cc b/test/verify_test.cc index e182f05d..1484dfb1 100644 --- a/test/verify_test.cc +++ b/test/verify_test.cc @@ -1421,7 +1421,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_xml_size_in_bytes) { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_CLOSED_CAPTION_XML_SIZE_IN_BYTES, - string("419336"), + string("419292"), canonical(dir / "subs.mxf") }, { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME }, @@ -1461,7 +1461,7 @@ verify_timed_text_asset_too_large (string name) check_verify_result ( { dir }, { - { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_TIMED_TEXT_SIZE_IN_BYTES, string("121695532"), canonical(dir / "subs.mxf") }, + { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_TIMED_TEXT_SIZE_IN_BYTES, string("121695488"), canonical(dir / "subs.mxf") }, { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_TIMED_TEXT_FONT_SIZE_IN_BYTES, string("121634816"), canonical(dir / "subs.mxf") }, { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf") }, { dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME }, -- cgit v1.2.3