summaryrefslogtreecommitdiff
path: root/test/kdm_naming_test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2025-06-21 13:25:20 +0200
committerCarl Hetherington <cth@carlh.net>2025-07-04 23:02:26 +0200
commitde8cd4118d57591804ccd63f979aa9e495df9c93 (patch)
tree82bd16a3a8cb44d34a21cd51581a1933a819018c /test/kdm_naming_test.cc
parent1650465106b7c20a7cc9ae5eec1cf9bf406c1dcf (diff)
Go back to the old way of handling KDM timing.
Once again the KDM gets its timezone from the cinema.
Diffstat (limited to 'test/kdm_naming_test.cc')
-rw-r--r--test/kdm_naming_test.cc14
1 files changed, 10 insertions, 4 deletions
diff --git a/test/kdm_naming_test.cc b/test/kdm_naming_test.cc
index fe7da7f31..4735ef75e 100644
--- a/test/kdm_naming_test.cc
+++ b/test/kdm_naming_test.cc
@@ -101,6 +101,9 @@ BOOST_AUTO_TEST_CASE (single_kdm_naming_test)
dcp::LocalTime until = sign_cert.not_after();
until.add_months (-2);
+ 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;
@@ -112,8 +115,8 @@ BOOST_AUTO_TEST_CASE (single_kdm_naming_test)
context.cinema_a,
*cinemas.cinema(context.cinema_a),
*cinemas.screen(context.cinema_a_screen_1),
- from,
- until,
+ boost::posix_time::time_from_string(from_string),
+ boost::posix_time::time_from_string(until_string),
dcp::Formulation::MODIFIED_TRANSITIONAL_1,
false,
optional<int>(),
@@ -165,6 +168,9 @@ BOOST_AUTO_TEST_CASE(directory_kdm_naming_test)
dcp::LocalTime until (sign_cert.not_after());
until.add_months (-2);
+ auto const from_string = from.date() + " " + from.time_of_day(true, false);
+ auto const until_string = until.date() + " " + until.time_of_day(true, false);
+
vector<pair<CinemaID, ScreenID>> screens = {
{ context.cinema_a, context.cinema_a_screen_2 },
{ context.cinema_b, context.cinema_b_screen_x },
@@ -188,8 +194,8 @@ BOOST_AUTO_TEST_CASE(directory_kdm_naming_test)
screen.first,
*cinemas.cinema(screen.first),
*cinemas.screen(screen.second),
- from,
- until,
+ boost::posix_time::time_from_string(from_string),
+ boost::posix_time::time_from_string(until_string),
dcp::Formulation::MODIFIED_TRANSITIONAL_1,
false,
optional<int>(),