X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fj2k_bandwidth_test.cc;h=c114cbfe7111641281d63742bb22dc68ea2d65d6;hb=1d2a51bdc8315fa7283be329669860e435a1513f;hp=ed8f5d9c8d523e18464b7d0522503fdc52234feb;hpb=e756452872422f948b06376ccfd07dfe5bc86969;p=dcpomatic.git

diff --git a/test/j2k_bandwidth_test.cc b/test/j2k_bandwidth_test.cc
index ed8f5d9c8..c114cbfe7 100644
--- a/test/j2k_bandwidth_test.cc
+++ b/test/j2k_bandwidth_test.cc
@@ -18,6 +18,11 @@
 
 */
 
+/** @file  test/bandwidth_test.cc
+ *  @brief Test whether we output whatever J2K bandwidth is requested.
+ *  @ingroup feature
+ */
+
 #include "test.h"
 #include "lib/dcp_content_type.h"
 #include "lib/film.h"
@@ -25,27 +30,27 @@
 #include "lib/video_content.h"
 #include <dcp/raw_convert.h>
 #include <boost/test/unit_test.hpp>
-#include <boost/shared_ptr.hpp>
+
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 static void
 check (int target_bits_per_second)
 {
 	int const duration = 10;
 
-	string const name = "j2k_bandwidth_test_" + dcp::raw_convert<string> (target_bits_per_second);
+	string const name = "bandwidth_test_" + dcp::raw_convert<string> (target_bits_per_second);
 	shared_ptr<Film> film = new_test_film (name);
 	film->set_name (name);
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
 	film->set_j2k_bandwidth (target_bits_per_second);
-	shared_ptr<ImageContent> content (new ImageContent (film, private_data / "prophet_frame.tiff"));
+	shared_ptr<ImageContent> content (new ImageContent(TestPaths::private_data() / "prophet_frame.tiff"));
 	film->examine_and_add_content (content);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 	content->video->set_length (24 * duration);
 	film->make_dcp ();
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	boost::filesystem::directory_iterator i (boost::filesystem::path ("build") / "test" / name / "video");
 	boost::filesystem::path test = *i++;
@@ -58,7 +63,7 @@ check (int target_bits_per_second)
 	BOOST_CHECK ((actual_bits_per_second / target_bits_per_second) < 1.15);
 }
 
-BOOST_AUTO_TEST_CASE (j2k_bandwidth_test)
+BOOST_AUTO_TEST_CASE (bandwidth_test)
 {
 	check (50000000);
 	check (100000000);