X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ffilm_metadata_test.cc;h=92c06210a7f3a4b46440464b7f5628da7a197762;hb=4e2ff7851127cd85c3e7d78b42eb884d0cda0ac3;hp=d1c30c3984f1a4ecb61d513895d84359ba2c92f3;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git

diff --git a/test/film_metadata_test.cc b/test/film_metadata_test.cc
index d1c30c398..92c06210a 100644
--- a/test/film_metadata_test.cc
+++ b/test/film_metadata_test.cc
@@ -18,27 +18,36 @@
 
 */
 
+
 /** @file  test/film_metadata_test.cc
  *  @brief Test some basic reading/writing of film metadata.
  *  @ingroup feature
  */
 
-#include <boost/test/unit_test.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/date_time.hpp>
-#include "lib/film.h"
+
+#include "lib/content.h"
+#include "lib/content_factory.h"
+#include "lib/dcp_content.h"
 #include "lib/dcp_content_type.h"
+#include "lib/film.h"
 #include "lib/ratio.h"
+#include "lib/text_content.h"
 #include "test.h"
+#include <boost/date_time.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/test/unit_test.hpp>
+
 
 using std::string;
 using std::list;
+using std::make_shared;
 using std::shared_ptr;
 
+
 BOOST_AUTO_TEST_CASE (film_metadata_test)
 {
-	shared_ptr<Film> film = new_test_film ("film_metadata_test");
-	boost::filesystem::path dir = test_film_dir ("film_metadata_test");
+	auto film = new_test_film ("film_metadata_test");
+	auto dir = test_film_dir ("film_metadata_test");
 
 	film->_isdcf_date = boost::gregorian::from_undelimited_string ("20130211");
 	BOOST_CHECK (film->container() == Ratio::from_id ("185"));
@@ -49,14 +58,16 @@ BOOST_AUTO_TEST_CASE (film_metadata_test)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_j2k_bandwidth (200000000);
 	film->set_interop (false);
+	film->set_chain (string(""));
+	film->set_distributor (string(""));
+	film->set_facility (string(""));
+	film->set_release_territory (dcp::LanguageTag::RegionSubtag("US"));
 	film->write_metadata ();
 
-	list<string> ignore;
-	ignore.push_back ("Key");
-	ignore.push_back ("ContextID");
+	list<string> ignore = { "Key", "ContextID" };
 	check_xml ("test/data/metadata.xml.ref", dir.string() + "/metadata.xml", ignore);
 
-	shared_ptr<Film> g (new Film (dir));
+	auto g = make_shared<Film>(dir);
 	g->read_metadata ();
 
 	BOOST_CHECK_EQUAL (g->name(), "fred");
@@ -66,3 +77,27 @@ BOOST_AUTO_TEST_CASE (film_metadata_test)
 	g->write_metadata ();
 	check_xml ("test/data/metadata.xml.ref", dir.string() + "/metadata.xml", ignore);
 }
+
+
+/** Check a bug where <Content> tags with multiple <Text>s would fail to load */
+BOOST_AUTO_TEST_CASE (multiple_text_nodes_are_allowed)
+{
+	auto subs = content_factory("test/data/15s.srt").front();
+	auto caps = content_factory("test/data/15s.srt").front();
+	auto film = new_test_film2("multiple_text_nodes_are_allowed1", { subs, caps });
+	caps->only_text()->set_type(TextType::CLOSED_CAPTION);
+	make_and_verify_dcp (
+		film,
+		{
+			dcp::VerificationNote::Code::MISSING_CPL_METADATA,
+			dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE,
+			dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME
+		});
+
+	auto reload = make_shared<DCPContent>(film->dir(film->dcp_name()));
+	auto film2 = new_test_film2("multiple_text_nodes_are_allowed2", { reload });
+	film2->write_metadata ();
+
+	auto test = make_shared<Film>(boost::filesystem::path("build/test/multiple_text_nodes_are_allowed2"));
+	test->read_metadata();
+}