X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fimage_content_fade_test.cc;h=70755f22abc8ec9e2edae3c61e81fa96e98adc0d;hb=99ec4ac0ec3b52e586ca4b6b7aedd19b04a167fc;hp=a3f093204cb37549f94cf4c76b421ecdeb55c6bc;hpb=ff06669bc8c14abe40cd9590afc8391f19608424;p=dcpomatic.git

diff --git a/test/image_content_fade_test.cc b/test/image_content_fade_test.cc
index a3f093204..70755f22a 100644
--- a/test/image_content_fade_test.cc
+++ b/test/image_content_fade_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2019-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,27 +18,29 @@
 
 */
 
-#include "test.h"
-#include "lib/film.h"
-#include "lib/content_factory.h"
+
 #include "lib/content.h"
+#include "lib/content_factory.h"
+#include "lib/film.h"
 #include "lib/video_content.h"
+#include "test.h"
 #include <boost/test/unit_test.hpp>
 
+
 using std::string;
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
+
 
 BOOST_AUTO_TEST_CASE (image_content_fade_test)
 {
-	shared_ptr<Film> film = new_test_film2 ("image_content_fade_test");
-	shared_ptr<Content> content = content_factory("test/data/flat_red.png").front();
+	auto film = new_test_film2 ("image_content_fade_test");
+	auto content = content_factory("test/data/flat_red.png")[0];
 	film->examine_and_add_content (content);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	content->video->set_fade_in (1);
-	film->make_dcp ();
-	wait_for_jobs ();
+	make_and_verify_dcp (film);
 
 	check_dcp ("test/data/image_content_fade_test", film->dir(film->dcp_name()));
 }