X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fimport_dcp_test.cc;h=cb485e68a872a2845b8c821d0ae1071ccf0b66e3;hb=61798477a11c99ba22b4dd733cb0678403e738af;hp=4c227ac34aea35cd81764062d0489aa0f6c6c6fc;hpb=736745c86cefc6d5d4d8098799efc86f0f639061;p=dcpomatic.git

diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc
index 4c227ac34..cb485e68a 100644
--- a/test/import_dcp_test.cc
+++ b/test/import_dcp_test.cc
@@ -20,7 +20,7 @@
 
 /** @file  test/import_dcp_test.cc
  *  @brief Test import of encrypted DCPs.
- *  @ingroup specific
+ *  @ingroup feature
  */
 
 #include "test.h"
@@ -125,7 +125,10 @@ BOOST_AUTO_TEST_CASE (import_dcp_markers_test)
 	BOOST_REQUIRE (!wait_for_jobs());
 	film2->write_metadata ();
 
-	BOOST_CHECK_EQUAL (imported->markers().size(), 3);
+	/* When import_dcp_markers_test was made a LFOC marker will automatically
+	 * have been added.
+	 */
+	BOOST_CHECK_EQUAL (imported->markers().size(), 4U);
 
 	map<dcp::Marker, dcpomatic::ContentTime> markers = imported->markers();
 	BOOST_REQUIRE(markers.find(dcp::FFOC) != markers.end());
@@ -138,11 +141,11 @@ BOOST_AUTO_TEST_CASE (import_dcp_markers_test)
 	/* Load that film and check that the markers have been loaded */
 	shared_ptr<Film> film3(new Film(boost::filesystem::path("build/test/import_dcp_markers_test2")));
 	film3->read_metadata ();
-	BOOST_REQUIRE (film3->content().size() == 1);
+	BOOST_REQUIRE_EQUAL (film3->content().size(), 1U);
 	shared_ptr<DCPContent> reloaded = dynamic_pointer_cast<DCPContent>(film3->content().front());
 	BOOST_REQUIRE (reloaded);
 
-	BOOST_CHECK_EQUAL (reloaded->markers().size(), 3);
+	BOOST_CHECK_EQUAL (reloaded->markers().size(), 4U);
 
 	markers = reloaded->markers();
 	BOOST_REQUIRE(markers.find(dcp::FFOC) != markers.end());
@@ -152,3 +155,49 @@ BOOST_AUTO_TEST_CASE (import_dcp_markers_test)
 	BOOST_REQUIRE(markers.find(dcp::LFMC) != markers.end());
 	BOOST_CHECK(markers[dcp::LFMC] == dcpomatic::ContentTime(960000));
 }
+
+
+/** Check that DCP metadata (ratings and content version) are imported correctly */
+BOOST_AUTO_TEST_CASE (import_dcp_metadata_test)
+{
+	/* Make a DCP with some ratings and a content version */
+	shared_ptr<Film> film = new_test_film2 ("import_dcp_metadata_test");
+	shared_ptr<Content> content = content_factory("test/data/flat_red.png").front();
+	film->examine_and_add_content (content);
+	BOOST_REQUIRE (!wait_for_jobs());
+
+	content->video->set_length (10);
+
+	std::vector<dcp::Rating> ratings;
+	ratings.push_back (dcp::Rating("BBFC", "15"));
+	ratings.push_back (dcp::Rating("MPAA", "NC-17"));
+	film->set_ratings (ratings);
+
+	vector<string> cv;
+	cv.push_back ("Fred");
+	film->set_content_versions (cv);
+
+	film->make_dcp ();
+	BOOST_REQUIRE (!wait_for_jobs());
+
+	/* Import the DCP to a new film and check the metadata */
+	shared_ptr<Film> film2 = new_test_film2 ("import_dcp_metadata_test2");
+	shared_ptr<DCPContent> imported (new DCPContent(film->dir(film->dcp_name())));
+	film2->examine_and_add_content (imported);
+	BOOST_REQUIRE (!wait_for_jobs());
+	film2->write_metadata ();
+
+	BOOST_CHECK (imported->ratings() == ratings);
+	BOOST_CHECK (imported->content_versions() == cv);
+
+	/* Load that film and check that the metadata has been loaded */
+	shared_ptr<Film> film3(new Film(boost::filesystem::path("build/test/import_dcp_metadata_test2")));
+	film3->read_metadata ();
+	BOOST_REQUIRE_EQUAL (film3->content().size(), 1U);
+	shared_ptr<DCPContent> reloaded = dynamic_pointer_cast<DCPContent>(film3->content().front());
+	BOOST_REQUIRE (reloaded);
+
+	BOOST_CHECK (reloaded->ratings() == ratings);
+	BOOST_CHECK (reloaded->content_versions() == cv);
+}
+