From 8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 31 Jan 2021 03:14:24 +0100 Subject: More enum class additions. --- test/recover_test.cc | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'test/recover_test.cc') diff --git a/test/recover_test.cc b/test/recover_test.cc index 13cb37a07..bdbd6f273 100644 --- a/test/recover_test.cc +++ b/test/recover_test.cc @@ -36,8 +36,9 @@ #include using std::cout; -using std::string; +using std::make_shared; using std::shared_ptr; +using std::string; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif @@ -85,15 +86,15 @@ BOOST_AUTO_TEST_CASE (recover_test_2d) BOOST_AUTO_TEST_CASE (recover_test_3d, * boost::unit_test::depends_on("recover_test_2d")) { - shared_ptr film = new_test_film ("recover_test_3d"); + auto film = new_test_film ("recover_test_3d"); film->set_interop (false); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR")); film->set_container (Ratio::from_id ("185")); film->set_name ("recover_test"); film->set_three_d (true); - shared_ptr content (new ImageContent("test/data/3d_test")); - content->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT_RIGHT); + auto content = make_shared("test/data/3d_test"); + content->video->set_frame_type (VideoFrameType::THREE_D_LEFT_RIGHT); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs()); @@ -112,8 +113,8 @@ BOOST_AUTO_TEST_CASE (recover_test_3d, * boost::unit_test::depends_on("recover_t film->make_dcp (); BOOST_REQUIRE (!wait_for_jobs()); - shared_ptr A (new dcp::StereoPictureAsset ("build/test/recover_test_3d/original.mxf")); - shared_ptr B (new dcp::StereoPictureAsset (video)); + auto A = make_shared("build/test/recover_test_3d/original.mxf"); + auto B = make_shared(video); dcp::EqualityOptions eq; BOOST_CHECK (A->equals (B, eq, boost::bind (¬e, _1, _2))); @@ -122,7 +123,7 @@ BOOST_AUTO_TEST_CASE (recover_test_3d, * boost::unit_test::depends_on("recover_t BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted, * boost::unit_test::depends_on("recover_test_3d")) { - shared_ptr film = new_test_film ("recover_test_2d_encrypted"); + auto film = new_test_film ("recover_test_2d_encrypted"); film->set_interop (false); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR")); film->set_container (Ratio::from_id ("185")); @@ -130,7 +131,7 @@ BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted, * boost::unit_test::depends_on( film->set_encrypted (true); film->_key = dcp::Key("eafcb91c9f5472edf01f3a2404c57258"); - shared_ptr content (new FFmpegContent("test/data/count300bd24.m2ts")); + auto content = make_shared("test/data/count300bd24.m2ts"); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs()); @@ -150,9 +151,9 @@ BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted, * boost::unit_test::depends_on( film->make_dcp (); BOOST_REQUIRE (!wait_for_jobs()); - shared_ptr A (new dcp::MonoPictureAsset ("build/test/recover_test_2d_encrypted/original.mxf")); + auto A = make_shared("build/test/recover_test_2d_encrypted/original.mxf"); A->set_key (film->key ()); - shared_ptr B (new dcp::MonoPictureAsset (video)); + auto B = make_shared(video); B->set_key (film->key ()); dcp::EqualityOptions eq; -- cgit v1.2.3