projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup some unused usings.
[dcpomatic.git]
/
test
/
recover_test.cc
diff --git
a/test/recover_test.cc
b/test/recover_test.cc
index bdbd6f273de0409482c7335c48d7378a4b9b9d60..b36dad05a5e9390ef3c394a8b3260a6aea559e3e 100644
(file)
--- a/
test/recover_test.cc
+++ b/
test/recover_test.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2014-20
15
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,11
+18,13
@@
*/
*/
+
/** @file test/recover_test.cc
* @brief Test recovery of a DCP transcode after a crash.
* @ingroup feature
*/
/** @file test/recover_test.cc
* @brief Test recovery of a DCP transcode after a crash.
* @ingroup feature
*/
+
#include "test.h"
#include "lib/film.h"
#include "lib/dcp_content_type.h"
#include "test.h"
#include "lib/film.h"
#include "lib/dcp_content_type.h"
@@
-35,6
+37,7
@@
#include <boost/test/unit_test.hpp>
#include <iostream>
#include <boost/test/unit_test.hpp>
#include <iostream>
+
using std::cout;
using std::make_shared;
using std::shared_ptr;
using std::cout;
using std::make_shared;
using std::shared_ptr;
@@
-43,6
+46,7
@@
using std::string;
using namespace boost::placeholders;
#endif
using namespace boost::placeholders;
#endif
+
static void
note (dcp::NoteType t, string n)
{
static void
note (dcp::NoteType t, string n)
{
@@
-51,6
+55,7
@@
note (dcp::NoteType t, string n)
}
}
}
}
+
BOOST_AUTO_TEST_CASE (recover_test_2d)
{
shared_ptr<Film> film = new_test_film ("recover_test_2d");
BOOST_AUTO_TEST_CASE (recover_test_2d)
{
shared_ptr<Film> film = new_test_film ("recover_test_2d");
@@
-63,8
+68,12
@@
BOOST_AUTO_TEST_CASE (recover_test_2d)
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs());
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs());
- film->make_dcp ();
- BOOST_REQUIRE (!wait_for_jobs());
+ make_and_verify_dcp (
+ film,
+ {
+ dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE,
+ dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE
+ });
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 (
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 (
@@
-74,8
+83,7
@@
BOOST_AUTO_TEST_CASE (recover_test_2d)
boost::filesystem::resize_file (video, 2 * 1024 * 1024);
boost::filesystem::resize_file (video, 2 * 1024 * 1024);
- film->make_dcp ();
- BOOST_REQUIRE (!wait_for_jobs());
+ make_and_verify_dcp (film, { dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE, dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE });
shared_ptr<dcp::MonoPictureAsset> A (new dcp::MonoPictureAsset ("build/test/recover_test_2d/original.mxf"));
shared_ptr<dcp::MonoPictureAsset> B (new dcp::MonoPictureAsset (video));
shared_ptr<dcp::MonoPictureAsset> A (new dcp::MonoPictureAsset ("build/test/recover_test_2d/original.mxf"));
shared_ptr<dcp::MonoPictureAsset> B (new dcp::MonoPictureAsset (video));
@@
-84,6
+92,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::unit_test::depends_on("recover_test_2d"))
{
auto film = new_test_film ("recover_test_3d");
BOOST_AUTO_TEST_CASE (recover_test_3d, * boost::unit_test::depends_on("recover_test_2d"))
{
auto film = new_test_film ("recover_test_3d");
@@
-98,8
+107,7
@@
BOOST_AUTO_TEST_CASE (recover_test_3d, * boost::unit_test::depends_on("recover_t
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs());
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs());
- film->make_dcp ();
- BOOST_REQUIRE (!wait_for_jobs());
+ make_and_verify_dcp (film, { dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE, dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE });
boost::filesystem::path const video = "build/test/recover_test_3d/video/185_2K_70e6661af92ae94458784c16a21a9748_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";
@@
-110,8
+118,7
@@
BOOST_AUTO_TEST_CASE (recover_test_3d, * boost::unit_test::depends_on("recover_t
boost::filesystem::resize_file (video, 2 * 1024 * 1024);
boost::filesystem::resize_file (video, 2 * 1024 * 1024);
- film->make_dcp ();
- BOOST_REQUIRE (!wait_for_jobs());
+ make_and_verify_dcp (film, { dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE, dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE });
auto A = make_shared<dcp::StereoPictureAsset>("build/test/recover_test_3d/original.mxf");
auto B = make_shared<dcp::StereoPictureAsset>(video);
auto A = make_shared<dcp::StereoPictureAsset>("build/test/recover_test_3d/original.mxf");
auto B = make_shared<dcp::StereoPictureAsset>(video);
@@
-135,8
+142,7
@@
BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted, * boost::unit_test::depends_on(
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs());
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs());
- film->make_dcp ();
- BOOST_REQUIRE (!wait_for_jobs());
+ make_and_verify_dcp (film, { dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE, dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE });
boost::filesystem::path const video =
"build/test/recover_test_2d_encrypted/video/185_2K_02543352c540f4b083bff3f1e309d4a9_24_100000000_Eeafcb91c9f5472edf01f3a2404c57258_S_0_1200000.mxf";
boost::filesystem::path const video =
"build/test/recover_test_2d_encrypted/video/185_2K_02543352c540f4b083bff3f1e309d4a9_24_100000000_Eeafcb91c9f5472edf01f3a2404c57258_S_0_1200000.mxf";
@@
-148,8
+154,7
@@
BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted, * boost::unit_test::depends_on(
boost::filesystem::resize_file (video, 2 * 1024 * 1024);
boost::filesystem::resize_file (video, 2 * 1024 * 1024);
- film->make_dcp ();
- BOOST_REQUIRE (!wait_for_jobs());
+ make_and_verify_dcp (film, { dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE, dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE });
auto A = make_shared<dcp::MonoPictureAsset>("build/test/recover_test_2d_encrypted/original.mxf");
A->set_key (film->key ());
auto A = make_shared<dcp::MonoPictureAsset>("build/test/recover_test_2d_encrypted/original.mxf");
A->set_key (film->key ());