/*
- Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2020-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
using std::string;
using std::vector;
+using std::make_shared;
using boost::optional;
-using boost::shared_ptr;
+using std::shared_ptr;
BOOST_AUTO_TEST_CASE (atmos_passthrough_test)
{
- shared_ptr<Film> film = new_test_film2 ("atmos_passthrough_test");
- boost::filesystem::path ref = TestPaths::private_data / "atmos_asset.mxf";
- shared_ptr<Content> content = content_factory (TestPaths::private_data / "atmos_asset.mxf").front();
- film->examine_and_add_content (content);
- BOOST_REQUIRE (!wait_for_jobs());
+ Cleanup cl;
- film->make_dcp ();
- BOOST_REQUIRE (!wait_for_jobs());
+ auto film = new_test_film2 (
+ "atmos_passthrough_test",
+ { content_factory(TestPaths::private_data() / "atmos_asset.mxf").front() },
+ &cl
+ );
+
+ make_and_verify_dcp (film, {dcp::VerificationNote::Code::MISSING_CPL_METADATA});
+ auto ref = TestPaths::private_data() / "atmos_asset.mxf";
BOOST_REQUIRE (mxf_atmos_files_same(ref, dcp_file(film, "atmos"), true));
+
+ cl.run ();
}
BOOST_AUTO_TEST_CASE (atmos_encrypted_passthrough_test)
{
- shared_ptr<Film> film = new_test_film2 ("atmos_encrypted_passthrough_test");
- boost::filesystem::path ref = TestPaths::private_data / "atmos_asset.mxf";
- shared_ptr<Content> content = content_factory (TestPaths::private_data / "atmos_asset.mxf").front();
- film->examine_and_add_content (content);
- BOOST_REQUIRE (!wait_for_jobs());
+ Cleanup cl;
+
+ auto ref = TestPaths::private_data() / "atmos_asset.mxf";
+ auto content = content_factory (TestPaths::private_data() / "atmos_asset.mxf").front();
+ auto film = new_test_film2 ("atmos_encrypted_passthrough_test", {content}, &cl);
film->set_encrypted (true);
film->_key = dcp::Key ("4fac12927eb122af1c2781aa91f3a4cc");
- film->make_dcp ();
- BOOST_REQUIRE (!wait_for_jobs());
+ make_and_verify_dcp (film, { dcp::VerificationNote::Code::MISSING_CPL_METADATA });
BOOST_REQUIRE (!mxf_atmos_files_same(ref, dcp_file(film, "atmos")));
- dcp::EncryptedKDM kdm = film->make_kdm (
+ auto kdm = film->make_kdm (
Config::instance()->decryption_chain()->leaf(),
vector<string>(),
dcp_file(film, "cpl"),
dcp::LocalTime(),
dcp::LocalTime(),
- dcp::MODIFIED_TRANSITIONAL_1,
+ dcp::Formulation::MODIFIED_TRANSITIONAL_1,
false,
optional<int>()
);
- shared_ptr<Film> film2 = new_test_film2 ("atmos_encrypted_passthrough_test2");
- shared_ptr<DCPContent> content2 (new DCPContent(film->dir(film->dcp_name())));
+ auto content2 = make_shared<DCPContent>(film->dir(film->dcp_name()));
content2->add_kdm (kdm);
- film2->examine_and_add_content (content2);
- BOOST_REQUIRE (!wait_for_jobs());
-
- film2->make_dcp ();
- BOOST_REQUIRE (!wait_for_jobs());
+ auto film2 = new_test_film2 ("atmos_encrypted_passthrough_test2", {content2}, &cl);
+ make_and_verify_dcp (film2, { dcp::VerificationNote::Code::MISSING_CPL_METADATA });
BOOST_CHECK (mxf_atmos_files_same(ref, dcp_file(film2, "atmos"), true));
+
+ cl.run ();
}