projects / dcpomatic.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Run all tests with lots of encoding threads.
[dcpomatic.git] / test / recover_test.cc
diff --git a/test/recover_test.cc b/test/recover_test.cc
index 83e83d88d84b5fc0b690f7897ceabb4c5ce93904..9c1ed7e66e0d7f1172882a26e3843f05c4ad4d78 100644 (file)
--- a/test/recover_test.cc
+++ b/test/recover_test.cc
@@ -20,6 +20,7 @@
 
 /** @file  test/recover_test.cc
  *  @brief Test recovery of a DCP transcode after a crash.
+ *  @ingroup specific
  */
 
 #include "test.h"
@@ -32,13 +33,11 @@
 #include <dcp/mono_picture_asset.h>
 #include <dcp/stereo_picture_asset.h>
 #include <boost/test/unit_test.hpp>
-#include <boost/make_shared.hpp>
 #include <iostream>
 
 using std::cout;
 using std::string;
 using boost::shared_ptr;
-using boost::make_shared;
 
 static void
 note (dcp::NoteType t, string n)
@@ -51,18 +50,19 @@ note (dcp::NoteType t, string n)
 BOOST_AUTO_TEST_CASE (recover_test_2d)
 {
        shared_ptr<Film> film = new_test_film ("recover_test_2d");
+       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");
 
-       shared_ptr<FFmpegContent> content = make_shared<FFmpegContent> (film, "test/data/count300bd24.m2ts");
+       shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/count300bd24.m2ts"));
        film->examine_and_add_content (content);
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        film->make_dcp ();
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
-       boost::filesystem::path const video = "build/test/recover_test_2d/video/185_2K_bf7d9a3ad543b4f048be97e8df309918_24_100000000_P_S_0_1200000.mxf";
+       boost::filesystem::path const video = "build/test/recover_test_2d/video/185_2K_02543352c540f4b083bff3f1e309d4a9_24_100000000_P_S_0_1200000.mxf";
        boost::filesystem::copy_file (
                video,
                "build/test/recover_test_2d/original.mxf"
@@ -71,32 +71,33 @@ BOOST_AUTO_TEST_CASE (recover_test_2d)
        boost::filesystem::resize_file (video, 2 * 1024 * 1024);
 
        film->make_dcp ();
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
-       shared_ptr<dcp::MonoPictureAsset> A = make_shared<dcp::MonoPictureAsset> ("build/test/recover_test_2d/original.mxf");
-       shared_ptr<dcp::MonoPictureAsset> B = make_shared<dcp::MonoPictureAsset> (video);
+       shared_ptr<dcp::MonoPictureAsset> A (new dcp::MonoPictureAsset ("build/test/recover_test_2d/original.mxf"));
+       shared_ptr<dcp::MonoPictureAsset> B (new dcp::MonoPictureAsset (video));
 
        dcp::EqualityOptions eq;
        BOOST_CHECK (A->equals (B, eq, boost::bind (&note, _1, _2)));
 }
 
-BOOST_AUTO_TEST_CASE (recover_test_3d)
+BOOST_AUTO_TEST_CASE (recover_test_3d, * boost::unit_test::depends_on("recover_test_2d"))
 {
        shared_ptr<Film> 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<ImageContent> content = make_shared<ImageContent> (film, "test/data/3d_test");
+       shared_ptr<ImageContent> content (new ImageContent("test/data/3d_test"));
        content->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT_RIGHT);
        film->examine_and_add_content (content);
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        film->make_dcp ();
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
-       boost::filesystem::path const video = "build/test/recover_test_3d/video/185_2K_961f053444e90c5ddbf978eb0ebfa772_24_100000000_P_S_3D_0_96000.mxf";
+       boost::filesystem::path const video = "build/test/recover_test_3d/video/185_2K_70e6661af92ae94458784c16a21a9748_24_100000000_P_S_3D_0_96000.mxf";
 
        boost::filesystem::copy_file (
                video,
@@ -106,10 +107,50 @@ BOOST_AUTO_TEST_CASE (recover_test_3d)
        boost::filesystem::resize_file (video, 2 * 1024 * 1024);
 
        film->make_dcp ();
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
-       shared_ptr<dcp::StereoPictureAsset> A = make_shared<dcp::StereoPictureAsset> ("build/test/recover_test_3d/original.mxf");
-       shared_ptr<dcp::StereoPictureAsset> B = make_shared<dcp::StereoPictureAsset> (video);
+       shared_ptr<dcp::StereoPictureAsset> A (new dcp::StereoPictureAsset ("build/test/recover_test_3d/original.mxf"));
+       shared_ptr<dcp::StereoPictureAsset> B (new dcp::StereoPictureAsset (video));
+
+       dcp::EqualityOptions eq;
+       BOOST_CHECK (A->equals (B, eq, boost::bind (&note, _1, _2)));
+}
+
+
+BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted, * boost::unit_test::depends_on("recover_test_3d"))
+{
+       shared_ptr<Film> 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"));
+       film->set_name ("recover_test");
+       film->set_encrypted (true);
+       film->set_key (dcp::Key("eafcb91c9f5472edf01f3a2404c57258"));
+
+       shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/count300bd24.m2ts"));
+       film->examine_and_add_content (content);
+       BOOST_REQUIRE (!wait_for_jobs());
+
+       film->make_dcp ();
+       BOOST_REQUIRE (!wait_for_jobs());
+
+       boost::filesystem::path const video =
+               "build/test/recover_test_2d_encrypted/video/185_2K_02543352c540f4b083bff3f1e309d4a9_24_100000000_Eeafcb91c9f5472edf01f3a2404c57258_S_0_1200000.mxf";
+
+       boost::filesystem::copy_file (
+               video,
+               "build/test/recover_test_2d_encrypted/original.mxf"
+               );
+
+       boost::filesystem::resize_file (video, 2 * 1024 * 1024);
+
+       film->make_dcp ();
+       BOOST_REQUIRE (!wait_for_jobs());
+
+       shared_ptr<dcp::MonoPictureAsset> A (new dcp::MonoPictureAsset ("build/test/recover_test_2d_encrypted/original.mxf"));
+       A->set_key (film->key ());
+       shared_ptr<dcp::MonoPictureAsset> B (new dcp::MonoPictureAsset (video));
+       B->set_key (film->key ());
 
        dcp::EqualityOptions eq;
        BOOST_CHECK (A->equals (B, eq, boost::bind (&note, _1, _2)));
2.0 development branch of dcpomatic