std::shared_ptr

[dcpomatic.git] / test / required_disk_space_test.cc

diff --git a/test/required_disk_space_test.cc b/test/required_disk_space_test.cc
index 812b35ff8ec96568626d446c8928bd17fd8b7fb2..a4be8b9b70376e433b76b83868a871ab9c330d7c 100644 (file)
--- a/test/required_disk_space_test.cc
+++ b/test/required_disk_space_test.cc
@@ -20,7 +20,7 @@
 
 /** @file  test/required_disk_space_test.cc
  *  @brief Check Film::required_disk_space
- *  @ingroup specific
+ *  @ingroup selfcontained
  */
 
 #include "lib/content_factory.h"
@@ -29,12 +29,12 @@
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 
 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);
 }
 
 
@@ -43,12 +43,13 @@ BOOST_AUTO_TEST_CASE (required_disk_space_test)
        shared_ptr<Film> film = new_test_film ("required_disk_space_test");
        film->set_j2k_bandwidth (100000000);
        film->set_audio_channels (6);
+       film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
        shared_ptr<Content> content_a = content_factory("test/data/flat_blue.png").front();
        BOOST_REQUIRE (content_a);
        film->examine_and_add_content (content_a);
        shared_ptr<DCPContent> content_b (new DCPContent("test/data/burnt_subtitle_test_dcp"));
        film->examine_and_add_content (content_b);
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
        film->write_metadata ();
 
        check_within_n (