Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

[dcpomatic.git] / test / recover_test.cc

diff --git a/test/recover_test.cc b/test/recover_test.cc
index acb4acaf8c58c73c87aa2b4f6c7a9240b58b28be..09f7a12493f0fa03288fd40295d5ee024efcaa62 100644 (file)
--- a/test/recover_test.cc
+++ b/test/recover_test.cc
@@ -17,6 +17,10 @@
 
 */
 
+/** @file  test/recover_test.cc
+ *  @brief Test recovery of a DCP transcode after a crash.
+ */
+
 #include <boost/test/unit_test.hpp>
 #include <dcp/stereo_picture_mxf.h>
 #include "lib/film.h"
@@ -30,16 +34,17 @@ using std::string;
 using boost::shared_ptr;
 
 static void
-note (dcp::NoteType, string n)
+note (dcp::NoteType t, string n)
 {
-       cout << n << "\n";
+       if (t == dcp::DCP_ERROR) {
+               cout << n << "\n";
+       }
 }
 
-/** Test recovery of a DCP transcode after a crash */
 BOOST_AUTO_TEST_CASE (recover_test)
 {
        shared_ptr<Film> film = new_test_film ("recover_test");
-       film->set_dcp_content_type (DCPContentType::from_dci_name ("FTR"));
+       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);
@@ -52,7 +57,7 @@ BOOST_AUTO_TEST_CASE (recover_test)
        film->make_dcp ();
        wait_for_jobs ();
 
-       boost::filesystem::path const video = "build/test/recover_test/video/185_2K_aa7e8a4665281568bbe11645a3d4ba4e_24_bicubic_200000000_P_S_3D.mxf";
+       boost::filesystem::path const video = "build/test/recover_test/video/185_2K_262d2f711190093815aa9f18c99495ce_24_100000000_P_S_3D.mxf";
 
        boost::filesystem::copy_file (
                video,
@@ -68,6 +73,6 @@ BOOST_AUTO_TEST_CASE (recover_test)
        shared_ptr<dcp::StereoPictureMXF> B (new dcp::StereoPictureMXF (video));
 
        dcp::EqualityOptions eq;
-       eq.mxf_names_can_differ = true;
+       eq.mxf_filenames_can_differ = true;
        BOOST_CHECK (A->equals (B, eq, boost::bind (&note, _1, _2)));
 }