diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-02-21 20:28:59 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-02-23 20:09:39 +0100 |
| commit | 41262015eb2bb1fc3da8585883420975de381a65 (patch) | |
| tree | f16a0bea110f57a820c7c45321775b3b7a9a4122 /test/import_dcp_test.cc | |
| parent | d756e14c0bb2c2264248b26d59c363b6bc33a7fc (diff) | |
Verify a whole bunch of DCPs made by unit tests.
Diffstat (limited to 'test/import_dcp_test.cc')
| -rw-r--r-- | test/import_dcp_test.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc index 44f3c7d44..54cea296b 100644 --- a/test/import_dcp_test.cc +++ b/test/import_dcp_test.cc @@ -111,10 +111,8 @@ BOOST_AUTO_TEST_CASE (import_dcp_markers_test) Cleanup cl; /* Make a DCP with some markers */ - auto film = new_test_film2 ("import_dcp_markers_test", &cl); auto content = content_factory("test/data/flat_red.png").front(); - film->examine_and_add_content (content); - BOOST_REQUIRE (!wait_for_jobs()); + auto film = new_test_film2 ("import_dcp_markers_test", {content}, &cl); content->video->set_length (24 * 60 * 10); @@ -126,10 +124,8 @@ BOOST_AUTO_TEST_CASE (import_dcp_markers_test) BOOST_REQUIRE (!wait_for_jobs()); /* Import the DCP to a new film and check the markers */ - auto film2 = new_test_film2 ("import_dcp_markers_test2", &cl); auto imported = make_shared<DCPContent>(film->dir(film->dcp_name())); - film2->examine_and_add_content (imported); - BOOST_REQUIRE (!wait_for_jobs()); + auto film2 = new_test_film2 ("import_dcp_markers_test2", {imported}, &cl); film2->write_metadata (); /* When import_dcp_markers_test was made a LFOC marker will automatically @@ -149,7 +145,7 @@ BOOST_AUTO_TEST_CASE (import_dcp_markers_test) auto film3 = make_shared<Film>(boost::filesystem::path("build/test/import_dcp_markers_test2")); film3->read_metadata (); BOOST_REQUIRE_EQUAL (film3->content().size(), 1U); - shared_ptr<DCPContent> reloaded = dynamic_pointer_cast<DCPContent>(film3->content().front()); + auto reloaded = dynamic_pointer_cast<DCPContent>(film3->content().front()); BOOST_REQUIRE (reloaded); BOOST_CHECK_EQUAL (reloaded->markers().size(), 4U); |