diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-09-11 09:32:06 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-09-11 09:32:06 +0200 |
| commit | 3bc8c0bd2375e8180a2745e760c91cfb59b413d7 (patch) | |
| tree | bd9e617932013933f1d3a00199c5cda897d75735 /test | |
| parent | 61fb89205e631cdb49161bbc4b321d5a93868120 (diff) | |
| parent | 3005c17f626e739b2f8d63f203a0b0a3240eb530 (diff) | |
Merge branch '2323-player-locking'
Various attempts to tidy up and fix the locking of Player (#2323).
Diffstat (limited to 'test')
| -rw-r--r-- | test/kdm_cli_test.cc | 5 | ||||
| -rw-r--r-- | test/vf_test.cc | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/kdm_cli_test.cc b/test/kdm_cli_test.cc index 107a6210a..e300d82a5 100644 --- a/test/kdm_cli_test.cc +++ b/test/kdm_cli_test.cc @@ -25,6 +25,7 @@ #include "lib/screen.h" #include "lib/trusted_device.h" #include "test.h" +#include <boost/algorithm/string/predicate.hpp> #include <boost/filesystem.hpp> #include <boost/test/unit_test.hpp> #include <iostream> @@ -128,7 +129,7 @@ BOOST_AUTO_TEST_CASE(kdm_cli_select_cinema) auto error = run(args, output); BOOST_CHECK(!error); - BOOST_REQUIRE_EQUAL(output.size(), 2); + BOOST_REQUIRE_EQUAL(output.size(), 2U); BOOST_CHECK(boost::algorithm::starts_with(output[0], "Making KDMs valid from")); BOOST_CHECK_EQUAL(output[1], "Wrote 2 KDM files to build/test"); @@ -164,7 +165,7 @@ BOOST_AUTO_TEST_CASE(kdm_cli_select_screen) auto error = run(args, output); BOOST_CHECK(!error); - BOOST_REQUIRE_EQUAL(output.size(), 2); + BOOST_REQUIRE_EQUAL(output.size(), 2U); BOOST_CHECK(boost::algorithm::starts_with(output[0], "Making KDMs valid from")); BOOST_CHECK_EQUAL(output[1], "Wrote 1 KDM files to build/test"); diff --git a/test/vf_test.cc b/test/vf_test.cc index f3ba156a1..32e7ae431 100644 --- a/test/vf_test.cc +++ b/test/vf_test.cc @@ -291,8 +291,7 @@ BOOST_AUTO_TEST_CASE (vf_test5) make_and_verify_dcp (vf, {dcp::VerificationNote::Code::EXTERNAL_ASSET}); /* Check that the selected reel assets are right */ - auto player = make_shared<Player>(vf, Image::Alignment::COMPACT); - auto a = player->get_reel_assets(); + auto a = get_referenced_reel_assets(vf, vf->playlist()); BOOST_REQUIRE_EQUAL (a.size(), 4U); auto i = a.begin(); BOOST_CHECK (i->period == DCPTimePeriod(DCPTime(0), DCPTime(960000))); |