X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Frequired_disk_space_test.cc;h=fad24389bfde51117f7d996caaf358dd37433ef5;hb=6f9adc9f7215a362d23e45b861017638ec67c723;hp=a66b6645e26f4373e9d1a758e4b4ab5be804aa0c;hpb=6cc7359c1af897f334dab5ba455707ce0c59af9d;p=dcpomatic.git

diff --git a/test/required_disk_space_test.cc b/test/required_disk_space_test.cc
index a66b6645e..fad24389b 100644
--- a/test/required_disk_space_test.cc
+++ b/test/required_disk_space_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,43 +18,48 @@
 
 */
 
+
 /** @file  test/required_disk_space_test.cc
  *  @brief Check Film::required_disk_space
- *  @ingroup specific
+ *  @ingroup selfcontained
  */
 
+
 #include "lib/content_factory.h"
-#include "lib/film.h"
 #include "lib/dcp_content.h"
+#include "lib/film.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+
+using std::dynamic_pointer_cast;
+using std::make_shared;
+
 
 void check_within_n (int64_t a, int64_t b, int64_t n)
 {
-	BOOST_CHECK (abs (a - b) <= n);
+	BOOST_CHECK_MESSAGE (abs(a - b) <= n, "Estimated " << a << " differs from reference " << b << " by more than " << n);
 }
 
 
 BOOST_AUTO_TEST_CASE (required_disk_space_test)
 {
-	shared_ptr<Film> film = new_test_film ("required_disk_space_test");
+	auto film = new_test_film ("required_disk_space_test");
 	film->set_j2k_bandwidth (100000000);
 	film->set_audio_channels (6);
-	shared_ptr<Content> content_a = content_factory("test/data/flat_blue.png").front();
+	film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
+	auto content_a = content_factory("test/data/flat_blue.png")[0];
 	BOOST_REQUIRE (content_a);
 	film->examine_and_add_content (content_a);
-	shared_ptr<DCPContent> content_b (new DCPContent("test/data/burnt_subtitle_test_dcp"));
+	auto content_b = make_shared<DCPContent>("test/data/burnt_subtitle_test_dcp");
 	film->examine_and_add_content (content_b);
 	BOOST_REQUIRE (!wait_for_jobs());
 	film->write_metadata ();
 
 	check_within_n (
 		film->required_disk_space(),
-		289LL * (100000000 / 8) / 24 +  // video
-		289LL * 48000 * 6 * 3 / 24 +    // audio
+		288LL * (100000000 / 8) / 24 +  // video
+		288LL * 48000 * 6 * 3 / 24 +    // audio
 		65536,                          // extra
 		16
 		);
@@ -64,7 +69,7 @@ BOOST_AUTO_TEST_CASE (required_disk_space_test)
 	check_within_n (
 		film->required_disk_space(),
 		240LL * (100000000 / 8) / 24 +  // video
-		289LL * 48000 * 6 * 3 / 24 +    // audio
+		288LL * 48000 * 6 * 3 / 24 +    // audio
 		65536,                          // extra
 		16
 		);