projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set focus on opening dialog.
[dcpomatic.git]
/
test
/
recover_test.cc
diff --git
a/test/recover_test.cc
b/test/recover_test.cc
index 0a73b0c23270cf2281ec4cfb928ca613edbd47bf..ad7f475bc0eb5e554a73075cb93ba7c2a24a88c7 100644
(file)
--- a/
test/recover_test.cc
+++ b/
test/recover_test.cc
@@
-62,7
+62,7
@@
BOOST_AUTO_TEST_CASE (recover_test_2d)
film->make_dcp ();
BOOST_REQUIRE (!wait_for_jobs());
film->make_dcp ();
BOOST_REQUIRE (!wait_for_jobs());
- boost::filesystem::path const video = "build/test/recover_test_2d/video/185_2K_
84d36460538435d5d511ee533c8528df
_24_100000000_P_S_0_1200000.mxf";
+ boost::filesystem::path const video = "build/test/recover_test_2d/video/185_2K_
02543352c540f4b083bff3f1e309d4a9
_24_100000000_P_S_0_1200000.mxf";
boost::filesystem::copy_file (
video,
"build/test/recover_test_2d/original.mxf"
boost::filesystem::copy_file (
video,
"build/test/recover_test_2d/original.mxf"
@@
-80,7
+80,7
@@
BOOST_AUTO_TEST_CASE (recover_test_2d)
BOOST_CHECK (A->equals (B, eq, boost::bind (¬e, _1, _2)));
}
BOOST_CHECK (A->equals (B, eq, boost::bind (¬e, _1, _2)));
}
-BOOST_AUTO_TEST_CASE (recover_test_3d)
+BOOST_AUTO_TEST_CASE (recover_test_3d
, * boost::unit_test::depends_on("recover_test_2d")
)
{
shared_ptr<Film> film = new_test_film ("recover_test_3d");
film->set_interop (false);
{
shared_ptr<Film> film = new_test_film ("recover_test_3d");
film->set_interop (false);
@@
-97,7
+97,7
@@
BOOST_AUTO_TEST_CASE (recover_test_3d)
film->make_dcp ();
BOOST_REQUIRE (!wait_for_jobs());
film->make_dcp ();
BOOST_REQUIRE (!wait_for_jobs());
- boost::filesystem::path const video = "build/test/recover_test_3d/video/185_2K_
961f053444e90c5ddbf978eb0ebfa772
_24_100000000_P_S_3D_0_96000.mxf";
+ boost::filesystem::path const video = "build/test/recover_test_3d/video/185_2K_
70e6661af92ae94458784c16a21a9748
_24_100000000_P_S_3D_0_96000.mxf";
boost::filesystem::copy_file (
video,
boost::filesystem::copy_file (
video,
@@
-117,7
+117,7
@@
BOOST_AUTO_TEST_CASE (recover_test_3d)
}
}
-BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted)
+BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted
, * boost::unit_test::depends_on("recover_test_3d")
)
{
shared_ptr<Film> film = new_test_film ("recover_test_2d_encrypted");
film->set_interop (false);
{
shared_ptr<Film> film = new_test_film ("recover_test_2d_encrypted");
film->set_interop (false);
@@
-125,6
+125,7
@@
BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted)
film->set_container (Ratio::from_id ("185"));
film->set_name ("recover_test");
film->set_encrypted (true);
film->set_container (Ratio::from_id ("185"));
film->set_name ("recover_test");
film->set_encrypted (true);
+ film->_key = dcp::Key("eafcb91c9f5472edf01f3a2404c57258");
shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/count300bd24.m2ts"));
film->examine_and_add_content (content);
shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/count300bd24.m2ts"));
film->examine_and_add_content (content);
@@
-134,7
+135,7
@@
BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted)
BOOST_REQUIRE (!wait_for_jobs());
boost::filesystem::path const video =
BOOST_REQUIRE (!wait_for_jobs());
boost::filesystem::path const video =
- "build/test/recover_test_2d_encrypted/video/185_2K_
84d36460538435d5d511ee533c8528df_24_100000000_E
_S_0_1200000.mxf";
+ "build/test/recover_test_2d_encrypted/video/185_2K_
02543352c540f4b083bff3f1e309d4a9_24_100000000_Eeafcb91c9f5472edf01f3a2404c57258
_S_0_1200000.mxf";
boost::filesystem::copy_file (
video,
boost::filesystem::copy_file (
video,