From 0d7a7b85095a5accf5f3666bc1d0a037a5455d0b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 9 Dec 2020 10:21:57 +0100 Subject: Bv2.1 6.2.1: Check that subtitle XML conforms to RFC 5646. --- test/verify_test.cc | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/verify_test.cc b/test/verify_test.cc index 3e983e4d..62b5c6c4 100644 --- a/test/verify_test.cc +++ b/test/verify_test.cc @@ -874,13 +874,15 @@ BOOST_AUTO_TEST_CASE (verify_test25) } -/* SMPTE DCP with invalid in the MainSubtitle */ +/* SMPTE DCP with invalid in the MainSubtitle reel and also in the XML within the MXF */ BOOST_AUTO_TEST_CASE (verify_test26) { boost::filesystem::path const dir("build/test/verify_test26"); prepare_directory (dir); boost::filesystem::copy_file ("test/data/subs.mxf", dir / "subs.mxf"); shared_ptr asset(new dcp::SMPTESubtitleAsset(dir / "subs.mxf")); + asset->_language = "wrong-andbad"; + asset->write (dir / "subs.mxf"); shared_ptr reel_asset(new dcp::ReelSubtitleAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0)); reel_asset->_language = "badlang"; shared_ptr reel(new dcp::Reel()); @@ -894,9 +896,14 @@ BOOST_AUTO_TEST_CASE (verify_test26) vector dirs; dirs.push_back (dir); list notes = dcp::verify (dirs, &stage, &progress, xsd_test); - BOOST_REQUIRE_EQUAL (notes.size(), 1U); + BOOST_REQUIRE_EQUAL (notes.size(), 2U); list::const_iterator i = notes.begin (); BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::BAD_LANGUAGE); - + BOOST_REQUIRE (i->note()); + BOOST_CHECK_EQUAL (*i->note(), "badlang"); + i++; + BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::BAD_LANGUAGE); + BOOST_REQUIRE (i->note()); + BOOST_CHECK_EQUAL (*i->note(), "wrong-andbad"); } -- cgit v1.2.3