Restore time zone to Cinema and improve UI to use it (#2473).

[dcpomatic.git] / test / kdm_naming_test.cc

diff --git a/test/kdm_naming_test.cc b/test/kdm_naming_test.cc
index 0f44fe2ea570cef51e83cf8b5258008cc3b210cf..f73e4295e445458968e7e83bf1379bc0401015ae 100644 (file)
--- a/test/kdm_naming_test.cc
+++ b/test/kdm_naming_test.cc
@@ -59,14 +59,14 @@ BOOST_AUTO_TEST_CASE (single_kdm_naming_test)
 
        auto crypt_cert = c->decryption_chain()->leaf();
 
-       auto cinema_a = make_shared<Cinema>("Cinema A", vector<string>(), "");
+       auto cinema_a = make_shared<Cinema>("Cinema A", vector<string>(), "", dcp::UTCOffset{4, 30});
        cinema_a_screen_1 = std::make_shared<dcpomatic::Screen>("Screen 1", "", crypt_cert, boost::none, vector<TrustedDevice>());
        cinema_a->add_screen (cinema_a_screen_1);
        cinema_a_screen_2 = std::make_shared<dcpomatic::Screen>("Screen 2", "", crypt_cert, boost::none, vector<TrustedDevice>());
        cinema_a->add_screen (cinema_a_screen_2);
        c->add_cinema (cinema_a);
 
-       auto cinema_b = make_shared<Cinema>("Cinema B", vector<string>(), "");
+       auto cinema_b = make_shared<Cinema>("Cinema B", vector<string>(), "", dcp::UTCOffset{-1, 0});
        cinema_b_screen_x = std::make_shared<dcpomatic::Screen>("Screen X", "", crypt_cert, boost::none, vector<TrustedDevice>());
        cinema_b->add_screen (cinema_b_screen_x);
        cinema_b_screen_y = std::make_shared<dcpomatic::Screen>("Screen Y", "", crypt_cert, boost::none, vector<TrustedDevice>());
@@ -89,10 +89,8 @@ BOOST_AUTO_TEST_CASE (single_kdm_naming_test)
        auto sign_cert = c->signer_chain()->leaf();
 
        dcp::LocalTime from = sign_cert.not_before();
-       from.set_offset({ 4, 30 });
        from.add_months (2);
        dcp::LocalTime until = sign_cert.not_after();
-       until.set_offset({ 4, 30 });
        until.add_months (-2);
 
        std::vector<KDMCertificatePeriod> period_checks;