X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Frequired_disk_space_test.cc;h=6a177fd712b6d07d9685d6cc8692ed64ff2758a7;hp=2c2f2ed17dcb323a458cb3540a5ed76aecf7af12;hb=d0555983d175e76585b2409d982e09f444eab391;hpb=7ab80b672a5e7d0ec8ad5dccda7503c04d40ffb5

diff --git a/test/required_disk_space_test.cc b/test/required_disk_space_test.cc
index 2c2f2ed17..6a177fd71 100644
--- a/test/required_disk_space_test.cc
+++ b/test/required_disk_space_test.cc
@@ -1,22 +1,28 @@
 /*
     Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+/** @file  test/required_disk_space_test.cc
+ *  @brief Check Film::required_disk_space
+ *  @ingroup specific
+ */
+
 #include "lib/content_factory.h"
 #include "lib/film.h"
 #include "lib/dcp_content.h"
@@ -28,7 +34,7 @@ using boost::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);
 }
 
 
@@ -37,11 +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);
-	shared_ptr<Content> content_a = content_factory (film, "test/data/flat_blue.png");
+	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 = dynamic_pointer_cast<DCPContent> (content_factory (film, "test/data/burnt_subtitle_test_dcp"));
+	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 (