X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fkdm_naming_test.cc;h=c58de34711c509a5d4ab4b554683f5abaec14dcf;hb=41262015eb2bb1fc3da8585883420975de381a65;hp=4ff0233dcfddd20e9d1d685a0e839f9a8b650264;hpb=39f0c853beb0363479f4216bd1d598eccd97495c;p=dcpomatic.git

diff --git a/test/kdm_naming_test.cc b/test/kdm_naming_test.cc
index 4ff0233dc..c58de3471 100644
--- a/test/kdm_naming_test.cc
+++ b/test/kdm_naming_test.cc
@@ -26,14 +26,14 @@
 #include "lib/kdm_with_metadata.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
-#include <boost/shared_ptr.hpp>
+
 
 using std::list;
 using std::string;
 using std::vector;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
 
 static
 bool
@@ -79,10 +79,8 @@ BOOST_AUTO_TEST_CASE (single_kdm_naming_test)
 	film->examine_and_add_content (content_factory("test/data/flat_black.png").front());
 	BOOST_REQUIRE (!wait_for_jobs());
 	film->set_encrypted (true);
-	film->make_dcp ();
-	BOOST_REQUIRE (!wait_for_jobs());
-	film->write_metadata ();
-	vector<CPLSummary> cpls = film->cpls ();
+	make_and_verify_dcp (film);
+	auto cpls = film->cpls ();
 	BOOST_REQUIRE(cpls.size() == 1);
 
 	dcp::LocalTime from (cert.not_before());
@@ -93,23 +91,20 @@ BOOST_AUTO_TEST_CASE (single_kdm_naming_test)
 	string const from_string = from.date() + " " + from.time_of_day(true, false);
 	string const until_string = until.date() + " " + until.time_of_day(true, false);
 
-	boost::filesystem::path cpl = cpls.front().cpl_file;
-	KDMWithMetadataPtr kdm = kdm_for_screen (
+	auto cpl = cpls.front().cpl_file;
+	auto kdm = kdm_for_screen (
 			film,
 			cpls.front().cpl_file,
 			cinema_a_screen_1,
 			boost::posix_time::time_from_string(from_string),
 			boost::posix_time::time_from_string(until_string),
-			dcp::MODIFIED_TRANSITIONAL_1,
+			dcp::Formulation::MODIFIED_TRANSITIONAL_1,
 			false,
 			optional<int>()
 			);
 
-	list<KDMWithMetadataPtr> kdms;
-	kdms.push_back (kdm);
-
 	write_files (
-		kdms,
+		{ kdm },
 		boost::filesystem::path("build/test/single_kdm_naming_test"),
 		dcp::NameFormat("KDM %c - %s - %f - %b - %e"),
 		&confirm_overwrite
@@ -133,15 +128,15 @@ BOOST_AUTO_TEST_CASE (directory_kdm_naming_test, * boost::unit_test::depends_on(
 
 	/* Film */
 	boost::filesystem::remove_all ("build/test/directory_kdm_naming_test");
-	shared_ptr<Film> film = new_test_film2 ("directory_kdm_naming_test");
+	auto film = new_test_film2 (
+		"directory_kdm_naming_test",
+		{ content_factory("test/data/flat_black.png").front() }
+		);
+
 	film->set_name ("my_great_film");
-	film->examine_and_add_content (content_factory("test/data/flat_black.png").front());
-	BOOST_REQUIRE (!wait_for_jobs());
 	film->set_encrypted (true);
-	film->make_dcp ();
-	BOOST_REQUIRE (!wait_for_jobs());
-	film->write_metadata ();
-	vector<CPLSummary> cpls = film->cpls ();
+	make_and_verify_dcp (film);
+	auto cpls = film->cpls ();
 	BOOST_REQUIRE(cpls.size() == 1);
 
 	dcp::LocalTime from (cert.not_before());
@@ -152,24 +147,22 @@ BOOST_AUTO_TEST_CASE (directory_kdm_naming_test, * boost::unit_test::depends_on(
 	string const from_string = from.date() + " " + from.time_of_day(true, false);
 	string const until_string = until.date() + " " + until.time_of_day(true, false);
 
-	list<shared_ptr<dcpomatic::Screen> > screens;
-	screens.push_back (cinema_a_screen_2);
-	screens.push_back (cinema_b_screen_x);
-	screens.push_back (cinema_a_screen_1);
-	screens.push_back (cinema_b_screen_z);
+	list<shared_ptr<dcpomatic::Screen>> screens = {
+		cinema_a_screen_2, cinema_b_screen_x, cinema_a_screen_1, (cinema_b_screen_z)
+	};
 
-	path const cpl = cpls.front().cpl_file;
-	string const cpl_id = cpls.front().cpl_id;
+	auto const cpl = cpls.front().cpl_file;
+	auto const cpl_id = cpls.front().cpl_id;
 
 	list<KDMWithMetadataPtr> kdms;
-	BOOST_FOREACH (shared_ptr<dcpomatic::Screen> i, screens) {
-		KDMWithMetadataPtr kdm = kdm_for_screen (
+	for (auto i: screens) {
+		auto kdm = kdm_for_screen (
 				film,
 				cpls.front().cpl_file,
 				i,
 				boost::posix_time::time_from_string(from_string),
 				boost::posix_time::time_from_string(until_string),
-				dcp::MODIFIED_TRANSITIONAL_1,
+				dcp::Formulation::MODIFIED_TRANSITIONAL_1,
 				false,
 				optional<int>()
 				);
@@ -190,9 +183,9 @@ BOOST_AUTO_TEST_CASE (directory_kdm_naming_test, * boost::unit_test::depends_on(
 		&confirm_overwrite
 		);
 
-	string from_time = from.time_of_day (true, false);
+	auto from_time = from.time_of_day (true, false);
 	boost::algorithm::replace_all (from_time, ":", "-");
-	string until_time = until.time_of_day (true, false);
+	auto until_time = until.time_of_day (true, false);
 	boost::algorithm::replace_all (until_time, ":", "-");
 
 	path const base = "build/test/directory_kdm_naming_test";