X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Frecover_test.cc;h=09f7a12493f0fa03288fd40295d5ee024efcaa62;hb=04bd447fd8960625bda5081cbac235b848d7631f;hp=c4e4f155daaf96736b0cd073b3f33616ed679da4;hpb=b666a794a130386bc01ede2143ef40bd6973eb32;p=dcpomatic.git

diff --git a/test/recover_test.cc b/test/recover_test.cc
index c4e4f155d..09f7a1249 100644
--- 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,20 +57,22 @@ BOOST_AUTO_TEST_CASE (recover_test)
 	film->make_dcp ();
 	wait_for_jobs ();
 
+	boost::filesystem::path const video = "build/test/recover_test/video/185_2K_262d2f711190093815aa9f18c99495ce_24_100000000_P_S_3D.mxf";
+
 	boost::filesystem::copy_file (
-		"build/test/recover_test/video/185_2K_58a090f8d70a2b410c534120d35e5256_24_bicubic_200000000_P_S_3D.mxf",
+		video,
 		"build/test/recover_test/original.mxf"
 		);
 	
-	boost::filesystem::resize_file ("build/test/recover_test/video/185_2K_58a090f8d70a2b410c534120d35e5256_24_bicubic_200000000_P_S_3D.mxf", 2 * 1024 * 1024);
+	boost::filesystem::resize_file (video, 2 * 1024 * 1024);
 
 	film->make_dcp ();
 	wait_for_jobs ();
 
 	shared_ptr<dcp::StereoPictureMXF> A (new dcp::StereoPictureMXF ("build/test/recover_test/original.mxf"));
-	shared_ptr<dcp::StereoPictureMXF> B (new dcp::StereoPictureMXF ("build/test/recover_test/video/185_2K_58a090f8d70a2b410c534120d35e5256_24_bicubic_200000000_P_S_3D.mxf"));
+	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)));
 }