diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-07-15 02:19:35 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-07-15 11:10:47 +0200 |
| commit | 847daf7ec0f741eb6d50638c2096743ee731634c (patch) | |
| tree | 8fba9c9571d0579151dcca8876cd22c5062825e6 /test | |
| parent | 66a6aea50054a5af8624c7d36949c642f4c8b619 (diff) | |
Change ExamineContentJob to take a vector of content.
Diffstat (limited to 'test')
| -rw-r--r-- | test/dcp_decoder_test.cc | 5 | ||||
| -rw-r--r-- | test/remake_id_test.cc | 3 | ||||
| -rw-r--r-- | test/vf_test.cc | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/test/dcp_decoder_test.cc b/test/dcp_decoder_test.cc index cf8366919..5e31856eb 100644 --- a/test/dcp_decoder_test.cc +++ b/test/dcp_decoder_test.cc @@ -43,6 +43,7 @@ using std::list; using std::make_shared; +using std::shared_ptr; using std::string; using std::vector; @@ -107,7 +108,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test) reels = decoder->reels(); vf_content->add_ov (ov->dir(ov->dcp_name(false))); - JobManager::instance()->add(make_shared<ExamineContentJob>(test, vf_content, false)); + JobManager::instance()->add(make_shared<ExamineContentJob>(test, vector<shared_ptr<Content>>{vf_content}, false)); BOOST_REQUIRE (!wait_for_jobs()); decoder = std::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder); BOOST_REQUIRE (decoder); @@ -125,7 +126,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test) reels = decoder->reels(); encrypted_content->add_kdm (kdm); - JobManager::instance()->add(make_shared<ExamineContentJob>(test, encrypted_content, false)); + JobManager::instance()->add(make_shared<ExamineContentJob>(test, vector<shared_ptr<Content>>{encrypted_content}, false)); BOOST_REQUIRE (!wait_for_jobs()); decoder = std::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder); BOOST_REQUIRE (decoder); diff --git a/test/remake_id_test.cc b/test/remake_id_test.cc index 84937c3ab..0673a4283 100644 --- a/test/remake_id_test.cc +++ b/test/remake_id_test.cc @@ -34,6 +34,7 @@ using std::dynamic_pointer_cast; using std::make_shared; +using std::shared_ptr; using std::string; using std::vector; using boost::optional; @@ -95,7 +96,7 @@ BOOST_AUTO_TEST_CASE (remake_id_test2) auto dcp_content = make_shared<DCPContent>(film->dir(film->dcp_name())); auto film2 = new_test_film("remake_id_test2_2", { dcp_content }); dcp_content->add_kdm(kdm); - JobManager::instance()->add(make_shared<ExamineContentJob>(film2, dcp_content, false)); + JobManager::instance()->add(make_shared<ExamineContentJob>(film2, vector<shared_ptr<Content>>{dcp_content}, false)); BOOST_REQUIRE(!wait_for_jobs()); make_and_verify_dcp (film2); } diff --git a/test/vf_test.cc b/test/vf_test.cc index dac7dbcf7..33e33f4be 100644 --- a/test/vf_test.cc +++ b/test/vf_test.cc @@ -425,7 +425,7 @@ BOOST_AUTO_TEST_CASE(test_duplicate_font_id_in_vf) auto test = new_test_film(name + "_test", { vf_dcp }); vf_dcp->add_ov(ov->dir(ov->dcp_name(false))); - JobManager::instance()->add(make_shared<ExamineContentJob>(test, vf_dcp, false)); + JobManager::instance()->add(make_shared<ExamineContentJob>(test, vector<shared_ptr<Content>>{vf_dcp}, false)); BOOST_CHECK(!wait_for_jobs()); make_and_verify_dcp( |