X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Frecover_test.cc;h=c2a335cfab83a5657bd5f8b980387c38c3c87b9e;hb=2d3092216e97c02bf715a3df19725518312a0b65;hp=284895e0a75d3bcee73ae157e078fc1ad6b86925;hpb=e7bc3bd16456c17bc6fe1d7981040b14e820505e;p=dcpomatic.git

diff --git a/test/recover_test.cc b/test/recover_test.cc
index 284895e0a..c2a335cfa 100644
--- a/test/recover_test.cc
+++ b/test/recover_test.cc
@@ -17,8 +17,12 @@
 
 */
 
+/** @file  test/recover_test.cc
+ *  @brief Test recovery of a DCP transcode after a crash.
+ */
+
 #include <boost/test/unit_test.hpp>
-#include <libdcp/stereo_picture_asset.h>
+#include <dcp/stereo_picture_mxf.h>
 #include "lib/film.h"
 #include "lib/dcp_content_type.h"
 #include "lib/image_content.h"
@@ -30,12 +34,13 @@ using std::string;
 using boost::shared_ptr;
 
 static void
-note (libdcp::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");
@@ -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_e01c58c5783da57b689e65d9123ad3a3_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<libdcp::StereoPictureAsset> A (new libdcp::StereoPictureAsset ("build/test/recover_test", "original.mxf"));
-	shared_ptr<libdcp::StereoPictureAsset> B (new libdcp::StereoPictureAsset ("build/test/recover_test/video", "185_2K_58a090f8d70a2b410c534120d35e5256_24_bicubic_200000000_P_S_3D.mxf"));
+	shared_ptr<dcp::StereoPictureMXF> A (new dcp::StereoPictureMXF ("build/test/recover_test/original.mxf"));
+	shared_ptr<dcp::StereoPictureMXF> B (new dcp::StereoPictureMXF (video));
 
-	libdcp::EqualityOptions eq;
-	eq.mxf_names_can_differ = true;
+	dcp::EqualityOptions eq;
+	eq.mxf_filenames_can_differ = true;
 	BOOST_CHECK (A->equals (B, eq, boost::bind (&note, _1, _2)));
 }