projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: test tidying.
[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 bcb53bdaf71534acd3372f49e70d7c9020ca595f..db659c2c9ff0d411697bbff5511250bdd741d323 100644
(file)
--- 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.
This file is part of DCP-o-matic.
@@
-18,37
+18,42
@@
*/
*/
+
/** @file test/required_disk_space_test.cc
* @brief Check Film::required_disk_space
/** @file test/required_disk_space_test.cc
* @brief Check Film::required_disk_space
- * @ingroup s
pecific
+ * @ingroup s
elfcontained
*/
*/
+
#include "lib/content_factory.h"
#include "lib/content_factory.h"
-#include "lib/film.h"
#include "lib/dcp_content.h"
#include "lib/dcp_content.h"
+#include "lib/film.h"
#include "test.h"
#include <boost/test/unit_test.hpp>
#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)
{
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)
{
}
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);
film->set_j2k_bandwidth (100000000);
film->set_audio_channels (6);
- shared_ptr<Content> content_a = content_factory(film, "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);
BOOST_REQUIRE (content_a);
film->examine_and_add_content (content_a);
-
shared_ptr<DCPContent> content_b (new DCPContent (film, "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);
film->examine_and_add_content (content_b);
-
wait_for_jobs (
);
+
BOOST_REQUIRE (!wait_for_jobs()
);
film->write_metadata ();
check_within_n (
film->write_metadata ();
check_within_n (