X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdcp_decoder_test.cc;h=a37b60ee8d00d73bce8c4e8ae9cb89c187f53493;hb=bb2924236bc100d6f98b7778bae31aeee48637fa;hp=da4f6dcbb8bd0f4bb55dc7ee6ef8d9afa8b22ea2;hpb=b1e22dff981fb86ae04b12bb5a064e61030793a8;p=dcpomatic.git diff --git a/test/dcp_decoder_test.cc b/test/dcp_decoder_test.cc index da4f6dcbb..a37b60ee8 100644 --- a/test/dcp_decoder_test.cc +++ b/test/dcp_decoder_test.cc @@ -42,10 +42,9 @@ using std::list; +using std::make_shared; using std::string; using std::vector; -using std::make_shared; -using std::shared_ptr; /* Check that DCPDecoder reuses old data when it should */ @@ -70,16 +69,11 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test) dcp::DCP encrypted_dcp (encrypted->dir(encrypted->dcp_name())); encrypted_dcp.read (); - auto kdm = encrypted->make_kdm ( - Config::instance()->decryption_chain()->leaf(), - vector(), - encrypted_dcp.cpls().front()->file().get(), - dcp::LocalTime ("2030-07-21T00:00:00+00:00"), - dcp::LocalTime ("2031-07-21T00:00:00+00:00"), - dcp::Formulation::MODIFIED_TRANSITIONAL_1, - true, 0 - ); + auto signer = Config::instance()->signer_chain(); + BOOST_REQUIRE(signer->valid()); + auto const decrypted_kdm = encrypted->make_kdm(encrypted_dcp.cpls().front()->file().get(), dcp::LocalTime ("2030-07-21T00:00:00+00:00"), dcp::LocalTime ("2031-07-21T00:00:00+00:00")); + auto const kdm = decrypted_kdm.encrypt(signer, Config::instance()->decryption_chain()->leaf(), {}, dcp::Formulation::MODIFIED_TRANSITIONAL_1, true, 0); /* Add just the OV to a new project, move it around a bit and check that the _reels get reused.