std::shared_ptr

[dcpomatic.git] / test / vf_kdm_test.cc

diff --git a/test/vf_kdm_test.cc b/test/vf_kdm_test.cc
index ba4bf6b22a3bada28feb293d72135cfc53d3be17..7a9c302637e521429881d3c3e4582bf978cd032b 100644 (file)
--- a/test/vf_kdm_test.cc
+++ b/test/vf_kdm_test.cc
@@ -18,6 +18,11 @@
 
 */
 
+/** @file  test/vf_kdm_test.cc
+ *  @brief Test encrypted VF creation and import
+ *  @ingroup feature
+ */
+
 #include "test.h"
 #include "lib/film.h"
 #include "lib/dcp_subtitle_content.h"
@@ -27,11 +32,13 @@
 #include "lib/ffmpeg_content.h"
 #include "lib/config.h"
 #include "lib/cross.h"
+#include "lib/screen.h"
 #include <dcp/cpl.h>
 #include <boost/test/unit_test.hpp>
 
 using std::vector;
-using boost::shared_ptr;
+using std::string;
+using std::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (vf_kdm_test)
 {
@@ -41,13 +48,14 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
        A->set_container (Ratio::from_id ("185"));
        A->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
        A->set_name ("frobozz");
+       A->set_interop (true);
 
-       shared_ptr<FFmpegContent> c (new FFmpegContent (A, "test/data/test.mp4"));
+       shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/test.mp4"));
        A->examine_and_add_content (c);
        A->set_encrypted (true);
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
        A->make_dcp ();
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        dcp::DCP A_dcp ("build/test/vf_kdm_test_ov/" + A->dcp_name());
        A_dcp.read ();
@@ -56,11 +64,12 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
 
        dcp::EncryptedKDM A_kdm = A->make_kdm (
                Config::instance()->decryption_chain()->leaf (),
-               vector<dcp::Certificate> (),
+               vector<string>(),
                A_dcp.cpls().front()->file().get(),
-               dcp::LocalTime ("2014-07-21T00:00:00+00:00"),
-               dcp::LocalTime ("2024-07-21T00:00:00+00:00"),
-               dcp::MODIFIED_TRANSITIONAL_1
+               dcp::LocalTime ("2030-07-21T00:00:00+00:00"),
+               dcp::LocalTime ("2031-07-21T00:00:00+00:00"),
+               dcp::MODIFIED_TRANSITIONAL_1,
+               true, 0
                );
 
        /* Import A into a new project, with the required KDM, and make a VF that refers to it */
@@ -69,26 +78,28 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
        B->set_container (Ratio::from_id ("185"));
        B->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
        B->set_name ("frobozz");
+       B->set_interop (true);
 
-       shared_ptr<DCPContent> d (new DCPContent (B, "build/test/vf_kdm_test_ov/" + A->dcp_name()));
+       shared_ptr<DCPContent> d (new DCPContent ("build/test/vf_kdm_test_ov/" + A->dcp_name()));
        d->add_kdm (A_kdm);
        d->set_reference_video (true);
        B->examine_and_add_content (d);
        B->set_encrypted (true);
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
        B->make_dcp ();
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        dcp::DCP B_dcp ("build/test/vf_kdm_test_vf/" + B->dcp_name());
        B_dcp.read ();
 
        dcp::EncryptedKDM B_kdm = B->make_kdm (
                Config::instance()->decryption_chain()->leaf (),
-               vector<dcp::Certificate> (),
+               vector<string>(),
                B_dcp.cpls().front()->file().get(),
-               dcp::LocalTime ("2014-07-21T00:00:00+00:00"),
-               dcp::LocalTime ("2024-07-21T00:00:00+00:00"),
-               dcp::MODIFIED_TRANSITIONAL_1
+               dcp::LocalTime ("2030-07-21T00:00:00+00:00"),
+               dcp::LocalTime ("2031-07-21T00:00:00+00:00"),
+               dcp::MODIFIED_TRANSITIONAL_1,
+               true, 0
                );
 
        /* Import the OV and VF into a new project with the KDM that was created for the VF.
@@ -99,14 +110,15 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
        C->set_container (Ratio::from_id ("185"));
        C->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
        C->set_name ("frobozz");
+       C->set_interop (true);
 
-       shared_ptr<DCPContent> e (new DCPContent (C, "build/test/vf_kdm_test_vf/" + B->dcp_name()));
+       shared_ptr<DCPContent> e (new DCPContent ("build/test/vf_kdm_test_vf/" + B->dcp_name()));
        e->add_kdm (B_kdm);
        e->add_ov ("build/test/vf_kdm_test_ov/" + A->dcp_name());
        C->examine_and_add_content (e);
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
        C->make_dcp ();
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        /* Should be 1s red, 1s green, 1s blue */
        check_dcp ("test/data/vf_kdm_test_check", "build/test/vf_kdm_test_check/" + C->dcp_name());