Cleanup: test tidying.

[dcpomatic.git] / test / atmos_test.cc

diff --git a/test/atmos_test.cc b/test/atmos_test.cc
index 50b642c1f423ff43e151cdf1fde2359fc2300fe8..5c624a871c230e9b5665e6bb466106efc5c57559 100644 (file)
--- a/test/atmos_test.cc
+++ b/test/atmos_test.cc
@@ -26,29 +26,27 @@
 #include "lib/film.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
-#include <iostream>
 
 
+using std::make_shared;
 using std::string;
 using std::vector;
-using std::make_shared;
 using boost::optional;
-using std::shared_ptr;
 
 
 BOOST_AUTO_TEST_CASE (atmos_passthrough_test)
 {
        Cleanup cl;
 
-       auto film = new_test_film2 ("atmos_passthrough_test", &cl);
-       auto ref = TestPaths::private_data() / "atmos_asset.mxf";
-       auto content = content_factory (TestPaths::private_data() / "atmos_asset.mxf").front();
-       film->examine_and_add_content (content);
-       BOOST_REQUIRE (!wait_for_jobs());
+       auto film = new_test_film2 (
+               "atmos_passthrough_test",
+               content_factory(TestPaths::private_data() / "atmos_asset.mxf"),
+               &cl
+               );
 
-       film->make_dcp ();
-       BOOST_REQUIRE (!wait_for_jobs());
+       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 ();
@@ -59,16 +57,13 @@ BOOST_AUTO_TEST_CASE (atmos_encrypted_passthrough_test)
 {
        Cleanup cl;
 
-       auto film = new_test_film2 ("atmos_encrypted_passthrough_test", &cl);
        auto ref = TestPaths::private_data() / "atmos_asset.mxf";
-       auto content = content_factory (TestPaths::private_data() / "atmos_asset.mxf").front();
-       film->examine_and_add_content (content);
-       BOOST_REQUIRE (!wait_for_jobs());
+       auto content = content_factory(TestPaths::private_data() / "atmos_asset.mxf");
+       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")));
 
@@ -83,17 +78,28 @@ BOOST_AUTO_TEST_CASE (atmos_encrypted_passthrough_test)
                optional<int>()
                );
 
-       auto film2 = new_test_film2 ("atmos_encrypted_passthrough_test2", &cl);
        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 ();
 }
 
+
+BOOST_AUTO_TEST_CASE (atmos_trim_test)
+{
+       Cleanup cl;
+
+       auto ref = TestPaths::private_data() / "atmos_asset.mxf";
+       auto content = content_factory(TestPaths::private_data() / "atmos_asset.mxf");
+       auto film = new_test_film2 ("atmos_trim_test", content, &cl);
+
+       content[0]->set_trim_start(film, dcpomatic::ContentTime::from_seconds(1));
+
+       /* Just check that the encode runs; I'm not sure how to test the MXF */
+       make_and_verify_dcp (film, { dcp::VerificationNote::Code::MISSING_CPL_METADATA });
+}
+