X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fvideo_mxf_content_test.cc;h=3ecc2775e23ae97fe60c0ec41fe194baab9eab72;hb=72307b2d09d1e677909b67825e098e1765828c42;hp=e5241b68783302ee1d7181c42796f4218ffb2f5c;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git

diff --git a/test/video_mxf_content_test.cc b/test/video_mxf_content_test.cc
index e5241b687..3ecc2775e 100644
--- a/test/video_mxf_content_test.cc
+++ b/test/video_mxf_content_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,49 +18,60 @@
 
 */
 
+
 /** @file  test/video_mxf_content_test.cc
  *  @brief Test use of Video MXF content.
  *  @ingroup feature
  */
 
-#include "lib/film.h"
-#include "lib/video_mxf_content.h"
+
+
 #include "lib/content_factory.h"
 #include "lib/dcp_content_type.h"
+#include "lib/film.h"
 #include "lib/ratio.h"
+#include "lib/video_mxf_content.h"
 #include "test.h"
 #include <dcp/mono_picture_asset.h>
 #include <boost/test/unit_test.hpp>
 
-using std::shared_ptr;
+
 using std::dynamic_pointer_cast;
+using std::make_shared;
 
-static boost::filesystem::path ref_mxf = "test/data/scaling_test_185_185/j2c_c75af074-2809-453c-9192-6affb76b4ba3.mxf";
 
 static void note (dcp::NoteType, std::string)
 {
 
 }
 
+
 /** Basic test of using video MXF content */
 BOOST_AUTO_TEST_CASE (video_mxf_content_test)
 {
-	shared_ptr<Film> film = new_test_film ("video_mxf_content_test");
+	auto film = new_test_film ("video_mxf_content_test");
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
 	film->set_container (Ratio::from_id ("185"));
 	film->set_name ("video_mxf_content_test");
 
-	shared_ptr<Content> content = content_factory(ref_mxf).front();
-	shared_ptr<VideoMXFContent> check = dynamic_pointer_cast<VideoMXFContent> (content);
+	auto const ref_mxf = find_file("test/data/scaling_test_185_185", "j2c");
+
+	auto content = content_factory(ref_mxf)[0];
+	auto check = dynamic_pointer_cast<VideoMXFContent> (content);
 	BOOST_REQUIRE (check);
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());
-	film->make_dcp ();
-	BOOST_REQUIRE (!wait_for_jobs());
+	make_and_verify_dcp (
+		film,
+		{
+			dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE,
+			dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE,
+			dcp::VerificationNote::Code::INVALID_JPEG2000_GUARD_BITS_FOR_2K
+		});
 
-	shared_ptr<dcp::MonoPictureAsset> ref (new dcp::MonoPictureAsset (ref_mxf));
+	auto ref = make_shared<dcp::MonoPictureAsset>(ref_mxf);
 	boost::filesystem::directory_iterator i ("build/test/video_mxf_content_test/video");
-	shared_ptr<dcp::MonoPictureAsset> comp (new dcp::MonoPictureAsset (*i));
+	auto comp = make_shared<dcp::MonoPictureAsset>(*i);
 	dcp::EqualityOptions op;
 	BOOST_CHECK (ref->equals (comp, op, note));
 }