X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Faudio_processor_test.cc;h=52dacb646bb65b4cfb4f777224c6ba5d8e9914fe;hp=de212f611352abf7ba51de08d1ed8a1f9fe08231;hb=fb0e2ead59a442700c671270c7d57b5bffeaeab3;hpb=9d4906db6e143248cf1e814d539aa2c7a50721dc

diff --git a/test/audio_processor_test.cc b/test/audio_processor_test.cc
index de212f611..52dacb646 100644
--- a/test/audio_processor_test.cc
+++ b/test/audio_processor_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,11 +18,13 @@
 
 */
 
+
 /** @file  test/audio_processor_test.cc
  *  @brief Test audio processors.
- *  @ingroup specific
+ *  @ingroup feature
  */
 
+
 #include "lib/audio_processor.h"
 #include "lib/analyse_audio_job.h"
 #include "lib/dcp_content_type.h"
@@ -32,28 +34,30 @@
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
-using boost::shared_ptr;
+
+using std::shared_ptr;
+using std::make_shared;
+
 
 /** Test the mid-side decoder for analysis and DCP-making */
 BOOST_AUTO_TEST_CASE (audio_processor_test)
 {
-	shared_ptr<Film> film = new_test_film ("audio_processor_test");
+	auto film = new_test_film ("audio_processor_test");
 	film->set_name ("audio_processor_test");
-	shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/white.wav"));
+	auto c = make_shared<FFmpegContent>("test/data/white.wav");
 	film->examine_and_add_content (c);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	film->set_audio_channels (6);
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
 	film->set_audio_processor (AudioProcessor::from_id ("mid-side-decoder"));
 
 	/* Analyse the audio and check it doesn't crash */
-	shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist(), false));
+	auto job = make_shared<AnalyseAudioJob> (film, film->playlist(), false);
 	JobManager::instance()->add (job);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	/* Make a DCP and check it */
-	film->make_dcp ();
-	wait_for_jobs ();
+	make_and_verify_dcp (film, {dcp::VerificationNote::Code::MISSING_CPL_METADATA});
 	check_dcp ("test/data/audio_processor_test", film->dir (film->dcp_name ()));
 }