diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-03-09 22:05:22 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-03-11 22:24:28 +0100 |
| commit | a5051181d4f6fe8d30aea66f5c14c2fab9337df0 (patch) | |
| tree | 8870a710a6cc284e1827930e3d2af5739d9f92fd | |
| parent | 2671c61a532790ad06c03775b103682233426570 (diff) | |
Improve and fix some tests.
| -rw-r--r-- | test/reels_test.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/test/reels_test.cc b/test/reels_test.cc index 7bf48a9cb..8bf63199b 100644 --- a/test/reels_test.cc +++ b/test/reels_test.cc @@ -121,6 +121,7 @@ BOOST_AUTO_TEST_CASE (reels_test2) } film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); + BOOST_CHECK_EQUAL (film->reels().size(), 3); BOOST_REQUIRE (!wait_for_jobs()); film->make_dcp (); @@ -325,12 +326,12 @@ BOOST_AUTO_TEST_CASE (reels_test7) film->examine_and_add_content (B); BOOST_REQUIRE (!wait_for_jobs ()); film->set_video_frame_rate (24); - A->video->set_length (3 * 24); + A->video->set_length (2 * 24); film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); BOOST_REQUIRE_EQUAL (film->reels().size(), 2); - BOOST_CHECK (film->reels().front() == DCPTimePeriod(DCPTime(0), DCPTime::from_frames(3 * 24, 24))); - BOOST_CHECK (film->reels().back() == DCPTimePeriod(DCPTime::from_frames(3 * 24, 24), DCPTime::from_frames(3 * 24 + 1, 24))); + BOOST_CHECK (film->reels().front() == DCPTimePeriod(DCPTime(0), DCPTime::from_frames(2 * 24, 24))); + BOOST_CHECK (film->reels().back() == DCPTimePeriod(DCPTime::from_frames(2 * 24, 24), DCPTime::from_frames(3 * 24 + 1, 24))); film->make_dcp (); BOOST_REQUIRE (!wait_for_jobs ()); @@ -514,6 +515,12 @@ BOOST_AUTO_TEST_CASE (reels_should_not_be_short1) BOOST_REQUIRE (!wait_for_jobs()); A->video->set_length (23); + shared_ptr<FFmpegContent> B(new FFmpegContent("test/data/flat_red.png")); + film->examine_and_add_content (B); + BOOST_REQUIRE (!wait_for_jobs()); + B->video->set_length (23); + B->set_position (film, DCPTime::from_frames(23, 24)); + film->make_dcp (); BOOST_REQUIRE (!wait_for_jobs()); |