Fill test disk partitions with random noise to expose more bugs.

[dcpomatic.git] / test / import_dcp_test.cc

diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc
index 54cea296baf2bf72f75c51a924c6b20d3894b245..cfac511b32e9e78f285eab944e58f8436b781a5c 100644 (file)
--- a/test/import_dcp_test.cc
+++ b/test/import_dcp_test.cc
@@ -54,6 +54,8 @@ using std::make_shared;
 /** Make an encrypted DCP, import it and make a new unencrypted DCP */
 BOOST_AUTO_TEST_CASE (import_dcp_test)
 {
+       ConfigRestorer cr;
+
        auto A = new_test_film ("import_dcp_test");
        A->set_container (Ratio::from_id ("185"));
        A->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
@@ -65,15 +67,13 @@ BOOST_AUTO_TEST_CASE (import_dcp_test)
        A->set_encrypted (true);
        BOOST_CHECK (!wait_for_jobs ());
 
-       A->make_dcp ();
-       BOOST_CHECK (!wait_for_jobs ());
+       make_and_verify_dcp (A);
 
        dcp::DCP A_dcp ("build/test/import_dcp_test/" + A->dcp_name());
        A_dcp.read ();
 
-       Config::instance()->set_decryption_chain (make_shared<dcp::CertificateChain>(openssl_path()));
+       Config::instance()->set_decryption_chain (make_shared<dcp::CertificateChain>(openssl_path(), CERTIFICATE_VALIDITY_PERIOD));
 
-       /* Dear future-carl: I suck!  I thought you wouldn't still be running these tests in 2030!  Sorry! */
        auto kdm = A->make_kdm (
                Config::instance()->decryption_chain()->leaf (),
                vector<string>(),
@@ -97,8 +97,7 @@ BOOST_AUTO_TEST_CASE (import_dcp_test)
        JobManager::instance()->add (make_shared<ExamineContentJob>(B, d));
        BOOST_CHECK (!wait_for_jobs ());
 
-       B->make_dcp ();
-       BOOST_CHECK (!wait_for_jobs ());
+       make_and_verify_dcp (B);
 
        /* Should be 1s red, 1s green, 1s blue */
        check_dcp ("test/data/import_dcp_test2", "build/test/import_dcp_test2/" + B->dcp_name());
@@ -116,12 +115,11 @@ BOOST_AUTO_TEST_CASE (import_dcp_markers_test)
 
        content->video->set_length (24 * 60 * 10);
 
-       film->set_marker(dcp::Marker::FFOC, dcpomatic::DCPTime::from_seconds(1.91));
+       film->set_marker(dcp::Marker::FFOC, dcpomatic::DCPTime::from_frames(1, 24));
        film->set_marker(dcp::Marker::FFMC, dcpomatic::DCPTime::from_seconds(9.4));
        film->set_marker(dcp::Marker::LFMC, dcpomatic::DCPTime::from_seconds(9.99));
 
-       film->make_dcp ();
-       BOOST_REQUIRE (!wait_for_jobs());
+       make_and_verify_dcp (film);
 
        /* Import the DCP to a new film and check the markers */
        auto imported = make_shared<DCPContent>(film->dir(film->dcp_name()));
@@ -134,8 +132,6 @@ BOOST_AUTO_TEST_CASE (import_dcp_markers_test)
        BOOST_CHECK_EQUAL (imported->markers().size(), 4U);
 
        auto markers = imported->markers();
-       BOOST_REQUIRE(markers.find(dcp::Marker::FFOC) != markers.end());
-       BOOST_CHECK(markers[dcp::Marker::FFOC] == dcpomatic::ContentTime(184000));
        BOOST_REQUIRE(markers.find(dcp::Marker::FFMC) != markers.end());
        BOOST_CHECK(markers[dcp::Marker::FFMC] == dcpomatic::ContentTime(904000));
        BOOST_REQUIRE(markers.find(dcp::Marker::LFMC) != markers.end());
@@ -151,8 +147,6 @@ BOOST_AUTO_TEST_CASE (import_dcp_markers_test)
        BOOST_CHECK_EQUAL (reloaded->markers().size(), 4U);
 
        markers = reloaded->markers();
-       BOOST_REQUIRE(markers.find(dcp::Marker::FFOC) != markers.end());
-       BOOST_CHECK(markers[dcp::Marker::FFOC] == dcpomatic::ContentTime(184000));
        BOOST_REQUIRE(markers.find(dcp::Marker::FFMC) != markers.end());
        BOOST_CHECK(markers[dcp::Marker::FFMC] == dcpomatic::ContentTime(904000));
        BOOST_REQUIRE(markers.find(dcp::Marker::LFMC) != markers.end());
@@ -179,8 +173,7 @@ BOOST_AUTO_TEST_CASE (import_dcp_metadata_test)
        vector<string> cv = { "Fred "};
        film->set_content_versions (cv);
 
-       film->make_dcp ();
-       BOOST_REQUIRE (!wait_for_jobs());
+       make_and_verify_dcp (film);
 
        /* Import the DCP to a new film and check the metadata */
        auto film2 = new_test_film2 ("import_dcp_metadata_test2");