X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fkdm_naming_test.cc;h=30356afbfe36015dcd6e03c06af3abd123145869;hb=7fd269fc10a67b7a0619a0a92541a47a1bc57be5;hp=f53f4aba2102d1987a324400884c628883ac6aef;hpb=d5d9e143a5778928c5f386a7bd9cb140d4f1191a;p=dcpomatic.git

diff --git a/test/kdm_naming_test.cc b/test/kdm_naming_test.cc
index f53f4aba2..30356afbf 100644
--- a/test/kdm_naming_test.cc
+++ b/test/kdm_naming_test.cc
@@ -81,7 +81,7 @@ BOOST_AUTO_TEST_CASE (single_kdm_naming_test)
 	boost::filesystem::remove_all ("build/test/single_kdm_naming_test");
 	auto film = new_test_film2 ("single_kdm_naming_test");
 	film->set_name ("my_great_film");
-	film->examine_and_add_content (content_factory("test/data/flat_black.png").front());
+	film->examine_and_add_content (content_factory("test/data/flat_black.png")[0]);
 	BOOST_REQUIRE (!wait_for_jobs());
 	film->set_encrypted (true);
 	make_and_verify_dcp (film);
@@ -98,16 +98,21 @@ BOOST_AUTO_TEST_CASE (single_kdm_naming_test)
 	auto const from_string = from.date() + " " + from.time_of_day(true, false);
 	auto const until_string = until.date() + " " + until.time_of_day(true, false);
 
+	std::vector<KDMCertificatePeriod> period_checks;
+
 	auto cpl = cpls.front().cpl_file;
+	std::function<dcp::DecryptedKDM (dcp::LocalTime, dcp::LocalTime)> make_kdm = [film, cpl](dcp::LocalTime begin, dcp::LocalTime end) {
+		return film->make_kdm(cpl, begin, end);
+	};
 	auto kdm = kdm_for_screen (
-			film,
-			cpls.front().cpl_file,
+			make_kdm,
 			cinema_a_screen_1,
 			boost::posix_time::time_from_string(from_string),
 			boost::posix_time::time_from_string(until_string),
 			dcp::Formulation::MODIFIED_TRANSITIONAL_1,
 			false,
-			optional<int>()
+			optional<int>(),
+			period_checks
 			);
 
 	write_files (
@@ -136,7 +141,7 @@ BOOST_AUTO_TEST_CASE (directory_kdm_naming_test, * boost::unit_test::depends_on(
 	boost::filesystem::remove_all ("build/test/directory_kdm_naming_test");
 	auto film = new_test_film2 (
 		"directory_kdm_naming_test",
-		{ content_factory("test/data/flat_black.png").front() }
+		{ content_factory("test/data/flat_black.png")[0] }
 		);
 
 	film->set_name ("my_great_film");
@@ -162,17 +167,23 @@ BOOST_AUTO_TEST_CASE (directory_kdm_naming_test, * boost::unit_test::depends_on(
 	auto const cpl = cpls.front().cpl_file;
 	auto const cpl_id = cpls.front().cpl_id;
 
+	std::vector<KDMCertificatePeriod> period_checks;
 	list<KDMWithMetadataPtr> kdms;
+
+	std::function<dcp::DecryptedKDM (dcp::LocalTime, dcp::LocalTime)> make_kdm = [film, cpls](dcp::LocalTime begin, dcp::LocalTime end) {
+		return film->make_kdm(cpls.front().cpl_file, begin, end);
+	};
+
 	for (auto i: screens) {
 		auto kdm = kdm_for_screen (
-				film,
-				cpls.front().cpl_file,
+				make_kdm,
 				i,
 				boost::posix_time::time_from_string(from_string),
 				boost::posix_time::time_from_string(until_string),
 				dcp::Formulation::MODIFIED_TRANSITIONAL_1,
 				false,
-				optional<int>()
+				optional<int>(),
+				period_checks
 				);
 
 		kdms.push_back (kdm);