X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fsilence_padding_test.cc;h=e4c640792d675bda09cfe7fd1acbe1b4c91d997f;hb=e6d7b6d8520c7454ecf67df7269056a16d0e2b70;hp=11c5bd0d1a17c7ca63cb365ed2e58717426b753b;hpb=e52d9526f0a49acb72e8b4aa980399b119171ba5;p=dcpomatic.git

diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc
index 11c5bd0d1..e4c640792 100644
--- a/test/silence_padding_test.cc
+++ b/test/silence_padding_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,11 +18,13 @@
 
 */
 
+
 /** @file  test/silence_padding_test.cc
  *  @brief Test the padding (with silence) of a mono source to a 6-channel DCP.
  *  @ingroup feature
  */
 
+
 #include "lib/ffmpeg_content.h"
 #include "lib/film.h"
 #include "lib/dcp_content_type.h"
@@ -37,27 +39,26 @@
 #include <dcp/sound_asset_reader.h>
 #include <boost/test/unit_test.hpp>
 
+
 using std::make_shared;
 using std::string;
 using std::shared_ptr;
 using boost::lexical_cast;
 
+
 static void
 test_silence_padding (int channels)
 {
 	string const film_name = "silence_padding_test_" + lexical_cast<string> (channels);
-	auto film = new_test_film (film_name);
-	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
-	film->set_container (Ratio::from_id ("185"));
-	film->set_name (film_name);
-
-	auto content = make_shared<FFmpegContent>("test/data/staircase.wav");
-	film->examine_and_add_content (content);
-	BOOST_REQUIRE (!wait_for_jobs());
+	auto film = new_test_film2 (
+		film_name,
+		{
+			make_shared<FFmpegContent>("test/data/flat_red.png"),
+			make_shared<FFmpegContent>("test/data/staircase.wav")
+		});
 
 	film->set_audio_channels (channels);
-	film->make_dcp ();
-	BOOST_REQUIRE (!wait_for_jobs());
+	make_and_verify_dcp (film);
 
 	boost::filesystem::path path = "build/test";
 	path /= film_name;
@@ -123,6 +124,7 @@ test_silence_padding (int channels)
 
 }
 
+
 BOOST_AUTO_TEST_CASE (silence_padding_test)
 {
 	for (int i = 1; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
@@ -130,20 +132,22 @@ BOOST_AUTO_TEST_CASE (silence_padding_test)
 	}
 }
 
+
 /** Test a situation that used to crash because of a sub-sample rounding confusion
  *  caused by a trim.
  */
 
 BOOST_AUTO_TEST_CASE (silence_padding_test2)
 {
-	auto film = new_test_film2 ("silence_padding_test2");
+	Cleanup cl;
+
 	auto content = make_shared<FFmpegContent>(TestPaths::private_data() / "cars.mov");
-	film->examine_and_add_content (content);
-	BOOST_REQUIRE (!wait_for_jobs());
+	auto film = new_test_film2 ("silence_padding_test2", { content }, &cl);
 
 	film->set_video_frame_rate (24);
 	content->set_trim_start (dcpomatic::ContentTime(4003));
 
-	film->make_dcp ();
-	BOOST_REQUIRE (!wait_for_jobs());
+	make_and_verify_dcp (film);
+
+	cl.run ();
 }