X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fimport_dcp_test.cc;h=05b020e1c1240a6b7ceacac7799fd2db386603dc;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=83dd0c6de043b8b35803e6b65987e3d1109fae38;hpb=5f3a88d3ab1e9c1a13d7e61fc37a0c4cef8df9a5;p=dcpomatic.git

diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc
index 83dd0c6de..05b020e1c 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"
@@ -43,8 +43,8 @@
 using std::vector;
 using std::string;
 using std::map;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 
 /** Make an encrypted DCP, import it and make a new unencrypted DCP */
 BOOST_AUTO_TEST_CASE (import_dcp_test)
@@ -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());
@@ -170,7 +173,9 @@ BOOST_AUTO_TEST_CASE (import_dcp_metadata_test)
 	ratings.push_back (dcp::Rating("MPAA", "NC-17"));
 	film->set_ratings (ratings);
 
-	film->set_content_version ("Fred");
+	vector<string> cv;
+	cv.push_back ("Fred");
+	film->set_content_versions (cv);
 
 	film->make_dcp ();
 	BOOST_REQUIRE (!wait_for_jobs());
@@ -183,16 +188,16 @@ BOOST_AUTO_TEST_CASE (import_dcp_metadata_test)
 	film2->write_metadata ();
 
 	BOOST_CHECK (imported->ratings() == ratings);
-	BOOST_CHECK_EQUAL (imported->content_version(), "Fred");
+	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 (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 (reloaded->ratings() == ratings);
-	BOOST_CHECK_EQUAL (reloaded->content_version(), "Fred");
+	BOOST_CHECK (reloaded->content_versions() == cv);
 }