diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-02-26 20:07:00 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-02-26 20:07:00 +0100 |
| commit | ed696661eff88297b4ad51625d596248697b1891 (patch) | |
| tree | 8437ca81a6049c33ed2eb353f2a81dd1f6278511 | |
| parent | 8f00a7b6568e37b82b2aca17ca316ca758c06a08 (diff) | |
Test fixes.
| -rw-r--r-- | test/import_dcp_test.cc | 3 | ||||
| -rw-r--r-- | test/threed_test.cc | 18 | ||||
| -rw-r--r-- | test/vf_kdm_test.cc | 3 |
3 files changed, 16 insertions, 8 deletions
diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc index 3620a55c5..8107aa77a 100644 --- a/test/import_dcp_test.cc +++ b/test/import_dcp_test.cc @@ -100,6 +100,9 @@ BOOST_AUTO_TEST_CASE (import_dcp_test) /* Should be 1s red, 1s green, 1s blue */ check_dcp ("test/data/import_dcp_test2", "build/test/import_dcp_test2/" + B->dcp_name()); + + /* Restore the reference decryption chain */ + setup_test_config (); } diff --git a/test/threed_test.cc b/test/threed_test.cc index cda278a59..a4889645f 100644 --- a/test/threed_test.cc +++ b/test/threed_test.cc @@ -23,16 +23,17 @@ * @ingroup completedcp */ -#include "test.h" -#include "lib/film.h" -#include "lib/ratio.h" #include "lib/config.h" +#include "lib/content_factory.h" +#include "lib/cross.h" #include "lib/dcp_content_type.h" #include "lib/ffmpeg_content.h" -#include "lib/video_content.h" -#include "lib/job_manager.h" -#include "lib/cross.h" +#include "lib/film.h" #include "lib/job.h" +#include "lib/job_manager.h" +#include "lib/ratio.h" +#include "lib/video_content.h" +#include "test.h" #include <boost/test/unit_test.hpp> #include <iostream> @@ -169,12 +170,13 @@ BOOST_AUTO_TEST_CASE (threed_test7) using boost::filesystem::path; auto film = new_test_film2 ("threed_test7"); - path const content_path = "test/data/red_24.mp4"; - auto c = make_shared<FFmpegContent>(content_path); + path const content_path = "test/data/flat_red.png"; + auto c = content_factory(content_path).front(); film->examine_and_add_content (c); BOOST_REQUIRE (!wait_for_jobs()); c->video->set_frame_type (VideoFrameType::THREE_D); + c->video->set_length (24); film->set_three_d (true); film->make_dcp (); diff --git a/test/vf_kdm_test.cc b/test/vf_kdm_test.cc index 86e6c3950..44d497e6d 100644 --- a/test/vf_kdm_test.cc +++ b/test/vf_kdm_test.cc @@ -124,4 +124,7 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test) /* Should be 1s red, 1s green, 1s blue */ check_dcp ("test/data/vf_kdm_test_check", "build/test/vf_kdm_test_check/" + C->dcp_name()); + + /* Restore the reference decryption chain */ + setup_test_config (); } |