/* Check that DCPDecoder reuses old data when it should */
BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
{
/* Make some DCPs */
/* Check that DCPDecoder reuses old data when it should */
BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
{
/* Make some DCPs */
- shared_ptr<Film> ov = new_test_film2 ("check_reuse_old_data_ov");
- ov->examine_and_add_content (content_factory("test/data/flat_red.png").front());
- BOOST_REQUIRE (!wait_for_jobs());
- ov->make_dcp ();
- BOOST_REQUIRE (!wait_for_jobs());
+ auto ov = new_test_film2 ("check_reuse_old_data_ov", {content_factory("test/data/flat_red.png").front()});
+ make_and_verify_dcp (ov);
- shared_ptr<Film> vf = new_test_film2 ("check_reuse_old_data_vf");
- shared_ptr<DCPContent> ov_content(new DCPContent(ov->dir(ov->dcp_name(false))));
- vf->examine_and_add_content (ov_content);
- vf->examine_and_add_content (content_factory("test/data/L.wav").front());
- BOOST_REQUIRE (!wait_for_jobs());
+ auto ov_content = make_shared<DCPContent>(ov->dir(ov->dcp_name(false)));
+ auto vf = new_test_film2 ("check_reuse_old_data_vf", {ov_content, content_factory("test/data/L.wav").front()});
encrypted->examine_and_add_content (content_factory("test/data/flat_red.png").front());
BOOST_REQUIRE (!wait_for_jobs());
encrypted->set_encrypted (true);
encrypted->examine_and_add_content (content_factory("test/data/flat_red.png").front());
BOOST_REQUIRE (!wait_for_jobs());
encrypted->set_encrypted (true);
Config::instance()->decryption_chain()->leaf(),
vector<string>(),
encrypted_dcp.cpls().front()->file().get(),
dcp::LocalTime ("2030-07-21T00:00:00+00:00"),
dcp::LocalTime ("2031-07-21T00:00:00+00:00"),
Config::instance()->decryption_chain()->leaf(),
vector<string>(),
encrypted_dcp.cpls().front()->file().get(),
dcp::LocalTime ("2030-07-21T00:00:00+00:00"),
dcp::LocalTime ("2031-07-21T00:00:00+00:00"),
- shared_ptr<Film> test = new_test_film2 ("check_reuse_old_data_test1");
- ov_content.reset (new DCPContent(ov->dir(ov->dcp_name(false))));
+ auto test = new_test_film2 ("check_reuse_old_data_test1");
+ ov_content = make_shared<DCPContent>(ov->dir(ov->dcp_name(false)));
BOOST_REQUIRE (decoder);
BOOST_REQUIRE (reels != decoder->reels());
/* Add a KDM to an encrypted DCP and check that the _reels did not get reused */
test = new_test_film2 ("check_reuse_old_data_test3");
BOOST_REQUIRE (decoder);
BOOST_REQUIRE (reels != decoder->reels());
/* Add a KDM to an encrypted DCP and check that the _reels did not get reused */
test = new_test_film2 ("check_reuse_old_data_test3");