From fa85cc6352a2f25bdd1d4421c9490f9fca266e04 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 14 Feb 2022 15:00:16 +0100 Subject: [PATCH] Head off some cert validity warnings. --- test/kdm_naming_test.cc | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/test/kdm_naming_test.cc b/test/kdm_naming_test.cc index f692c165d..4e1f81b1c 100644 --- a/test/kdm_naming_test.cc +++ b/test/kdm_naming_test.cc @@ -57,23 +57,23 @@ BOOST_AUTO_TEST_CASE (single_kdm_naming_test) { auto c = Config::instance(); - auto cert = c->decryption_chain()->leaf(); + auto crypt_cert = c->decryption_chain()->leaf(); /* Cinema A: UTC +4:30 */ auto cinema_a = make_shared("Cinema A", list(), "", 4, 30); - cinema_a_screen_1 = make_shared("Screen 1", "", cert, vector()); + cinema_a_screen_1 = make_shared("Screen 1", "", crypt_cert, vector()); cinema_a->add_screen (cinema_a_screen_1); - cinema_a_screen_2 = make_shared("Screen 2", "", cert, vector()); + cinema_a_screen_2 = make_shared("Screen 2", "", crypt_cert, vector()); cinema_a->add_screen (cinema_a_screen_2); c->add_cinema (cinema_a); /* Cinema B: UTC -1:00 */ auto cinema_b = make_shared("Cinema B", list(), "", -1, 0); - cinema_b_screen_x = make_shared("Screen X", "", cert, vector()); + cinema_b_screen_x = make_shared("Screen X", "", crypt_cert, vector()); cinema_b->add_screen (cinema_b_screen_x); - cinema_b_screen_y = make_shared("Screen Y", "", cert, vector()); + cinema_b_screen_y = make_shared("Screen Y", "", crypt_cert, vector()); cinema_b->add_screen (cinema_b_screen_y); - cinema_b_screen_z = make_shared("Screen Z", "", cert, vector()); + cinema_b_screen_z = make_shared("Screen Z", "", crypt_cert, vector()); cinema_b->add_screen (cinema_b_screen_z); c->add_cinema (cinema_a); @@ -88,9 +88,11 @@ BOOST_AUTO_TEST_CASE (single_kdm_naming_test) auto cpls = film->cpls (); BOOST_REQUIRE(cpls.size() == 1); - dcp::LocalTime from (cert.not_before()); + auto sign_cert = c->signer_chain()->leaf(); + + dcp::LocalTime from (sign_cert.not_before()); from.add_months (2); - dcp::LocalTime until (cert.not_after()); + dcp::LocalTime until (sign_cert.not_after()); until.add_months (-2); auto const from_string = from.date() + " " + from.time_of_day(true, false); @@ -129,8 +131,6 @@ BOOST_AUTO_TEST_CASE (directory_kdm_naming_test, * boost::unit_test::depends_on( { using boost::filesystem::path; - auto cert = Config::instance()->decryption_chain()->leaf(); - /* Film */ boost::filesystem::remove_all ("build/test/directory_kdm_naming_test"); auto film = new_test_film2 ( @@ -144,9 +144,11 @@ BOOST_AUTO_TEST_CASE (directory_kdm_naming_test, * boost::unit_test::depends_on( auto cpls = film->cpls (); BOOST_REQUIRE(cpls.size() == 1); - dcp::LocalTime from (cert.not_before()); + auto sign_cert = Config::instance()->signer_chain()->leaf(); + + dcp::LocalTime from (sign_cert.not_before()); from.add_months (2); - dcp::LocalTime until (cert.not_after()); + dcp::LocalTime until (sign_cert.not_after()); until.add_months (-2); string const from_string = from.date() + " " + from.time_of_day(true, false); -- 2.30.2