X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_dcp_test.cc;h=0d56f4290fd1788db1e655773717e5274df96e71;hb=266e3f1b80d1263ff3cc8b3afaecd6ca1f88983b;hp=c69516b9f65714abedaec5fec6f625d2b4c0d07b;hpb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;p=dcpomatic.git

diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc
index c69516b9f..0d56f4290 100644
--- a/test/ffmpeg_dcp_test.cc
+++ b/test/ffmpeg_dcp_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,55 +18,57 @@
 
 */
 
+
 /** @file test/ffmpeg_dcp_test.cc
  *  @brief Test creation of a very simple DCP from some FFmpegContent (data/test.mp4).
+ *  @ingroup feature
  *
  *  Also a quick test of Film::have_dcp ().
  */
 
+
+#include <boost/test/unit_test.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/algorithm/string.hpp>
 #include "lib/film.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/ratio.h"
 #include "lib/dcp_content_type.h"
 #include "lib/video_content.h"
 #include "test.h"
-#include <boost/test/unit_test.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/algorithm/string.hpp>
-#include <boost/make_shared.hpp>
 
-using boost::shared_ptr;
-using boost::make_shared;
+
+using std::make_shared;
+using std::shared_ptr;
+
 
 BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
 {
-	shared_ptr<Film> film = new_test_film ("ffmpeg_dcp_test");
+	auto film = new_test_film ("ffmpeg_dcp_test");
 	film->set_name ("test_film2");
-	shared_ptr<FFmpegContent> c = make_shared<FFmpegContent> (film, "test/data/test.mp4");
+	auto c = make_shared<FFmpegContent>("test/data/test.mp4");
 	film->examine_and_add_content (c);
 
-	wait_for_jobs ();
-
-	c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	film->set_container (Ratio::from_id ("185"));
-	film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
-	film->make_dcp ();
-	film->write_metadata ();
+	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
+	make_and_verify_dcp (film);
 
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 }
 
-/** Briefly test Film::cpls().  Requires the output from ffmpeg_dcp_test above */
-BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test)
+
+/** Briefly test Film::cpls() */
+BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test, * boost::unit_test::depends_on("ffmpeg_dcp_test"))
 {
-	boost::filesystem::path p = test_film_dir ("ffmpeg_dcp_test");
-	shared_ptr<Film> film = boost::make_shared<Film> (p.string ());
+	auto p = test_film_dir ("ffmpeg_dcp_test");
+	auto film = make_shared<Film>(p);
 	film->read_metadata ();
 	BOOST_CHECK (!film->cpls().empty());
 
 	p /= film->dcp_name();
-	boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (p);
+	auto i = boost::filesystem::directory_iterator (p);
 	while (i != boost::filesystem::directory_iterator() && !boost::algorithm::starts_with (i->path().leaf().string(), "j2c")) {
 		++i;
 	}