projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Give Butler a weak_ptr<Film>
[dcpomatic.git]
/
test
/
no_use_video_test.cc
diff --git
a/test/no_use_video_test.cc
b/test/no_use_video_test.cc
index 2577f935b6589a5bc263dcb0ba955635e5191203..46b7e2aef8954f05147d4c0c593c149e4ef3d7cf 100644
(file)
--- a/
test/no_use_video_test.cc
+++ b/
test/no_use_video_test.cc
@@
-72,8
+72,8
@@
BOOST_AUTO_TEST_CASE (no_use_video_test1)
BOOST_AUTO_TEST_CASE (no_use_video_test2)
{
shared_ptr<Film> film = new_test_film2 ("no_use_video_test2");
BOOST_AUTO_TEST_CASE (no_use_video_test2)
{
shared_ptr<Film> film = new_test_film2 ("no_use_video_test2");
- shared_ptr<Content> A = content_factory (TestPaths::private_data / "dolby_aurora.vob").front();
- shared_ptr<Content> B = content_factory (TestPaths::private_data / "big_buck_bunny_trailer_480p.mov").front();
+ shared_ptr<Content> A = content_factory (TestPaths::private_data
()
/ "dolby_aurora.vob").front();
+ shared_ptr<Content> B = content_factory (TestPaths::private_data
()
/ "big_buck_bunny_trailer_480p.mov").front();
film->examine_and_add_content (A);
film->examine_and_add_content (B);
BOOST_REQUIRE (!wait_for_jobs());
film->examine_and_add_content (A);
film->examine_and_add_content (B);
BOOST_REQUIRE (!wait_for_jobs());
@@
-85,7
+85,7
@@
BOOST_AUTO_TEST_CASE (no_use_video_test2)
film->make_dcp ();
BOOST_REQUIRE (!wait_for_jobs());
film->make_dcp ();
BOOST_REQUIRE (!wait_for_jobs());
- check_dcp (
"test/data/
no_use_video_test2", film);
+ check_dcp (
TestPaths::private_data() / "
no_use_video_test2", film);
}
}
@@
-136,20
+136,20
@@
BOOST_AUTO_TEST_CASE (no_use_video_test3)
dcp::DCP ov_a_check (ov_a->dir(ov_a->dcp_name()));
ov_a_check.read ();
dcp::DCP ov_a_check (ov_a->dir(ov_a->dcp_name()));
ov_a_check.read ();
- BOOST_REQUIRE_EQUAL (ov_a_check.cpls().size(), 1);
- BOOST_REQUIRE_EQUAL (ov_a_check.cpls().front()->reels().size(), 1);
+ BOOST_REQUIRE_EQUAL (ov_a_check.cpls().size(), 1
U
);
+ BOOST_REQUIRE_EQUAL (ov_a_check.cpls().front()->reels().size(), 1
U
);
shared_ptr<dcp::Reel> ov_a_reel (ov_a_check.cpls().front()->reels().front());
dcp::DCP ov_b_check (ov_b->dir(ov_b->dcp_name()));
ov_b_check.read ();
shared_ptr<dcp::Reel> ov_a_reel (ov_a_check.cpls().front()->reels().front());
dcp::DCP ov_b_check (ov_b->dir(ov_b->dcp_name()));
ov_b_check.read ();
- BOOST_REQUIRE_EQUAL (ov_b_check.cpls().size(), 1);
- BOOST_REQUIRE_EQUAL (ov_b_check.cpls().front()->reels().size(), 1);
+ BOOST_REQUIRE_EQUAL (ov_b_check.cpls().size(), 1
U
);
+ BOOST_REQUIRE_EQUAL (ov_b_check.cpls().front()->reels().size(), 1
U
);
shared_ptr<dcp::Reel> ov_b_reel (ov_b_check.cpls().front()->reels().front());
dcp::DCP vf_check (vf->dir(vf->dcp_name()));
vf_check.read ();
shared_ptr<dcp::Reel> ov_b_reel (ov_b_check.cpls().front()->reels().front());
dcp::DCP vf_check (vf->dir(vf->dcp_name()));
vf_check.read ();
- BOOST_REQUIRE_EQUAL (vf_check.cpls().size(), 1);
- BOOST_REQUIRE_EQUAL (vf_check.cpls().front()->reels().size(), 1);
+ BOOST_REQUIRE_EQUAL (vf_check.cpls().size(), 1
U
);
+ BOOST_REQUIRE_EQUAL (vf_check.cpls().front()->reels().size(), 1
U
);
shared_ptr<dcp::Reel> vf_reel (vf_check.cpls().front()->reels().front());
BOOST_CHECK_EQUAL (vf_reel->main_picture()->asset_ref().id(), ov_b_reel->main_picture()->asset_ref().id());
shared_ptr<dcp::Reel> vf_reel (vf_check.cpls().front()->reels().front());
BOOST_CHECK_EQUAL (vf_reel->main_picture()->asset_ref().id(), ov_b_reel->main_picture()->asset_ref().id());