X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fj2k_bandwidth_test.cc;h=a1e6c1ac68bdf1989289c49820c4b27a5ab691de;hb=a332bd6be323f03dad5b180fb237afe54f1bf81e;hp=92f6f90d821e1413256f68f50a457f61fb47a37e;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;p=dcpomatic.git

diff --git a/test/j2k_bandwidth_test.cc b/test/j2k_bandwidth_test.cc
index 92f6f90d8..a1e6c1ac6 100644
--- a/test/j2k_bandwidth_test.cc
+++ b/test/j2k_bandwidth_test.cc
@@ -18,9 +18,9 @@
 
 */
 
-/** @file  test/j2k_bandwidth_test.cc
+/** @file  test/bandwidth_test.cc
  *  @brief Test whether we output whatever J2K bandwidth is requested.
- *  @ingroup specific
+ *  @ingroup feature
  */
 
 #include "test.h"
@@ -40,17 +40,17 @@ 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(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++;
@@ -63,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);