Fix or remove several broken pixel formats in Image::fade and add

[dcpomatic.git] / test / import_dcp_test.cc

diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc
index 403c1c992320edf01e635f5d6457048f79748ea3..71689f613c6f2663b377dcbc234079ce3d0275ed 100644 (file)
--- a/test/import_dcp_test.cc
+++ b/test/import_dcp_test.cc
@@ -25,17 +25,21 @@
 
 #include "test.h"
 #include "lib/film.h"
+#include "lib/screen.h"
 #include "lib/dcp_subtitle_content.h"
 #include "lib/ratio.h"
 #include "lib/dcp_content_type.h"
 #include "lib/dcp_content.h"
 #include "lib/ffmpeg_content.h"
+#include "lib/examine_content_job.h"
+#include "lib/job_manager.h"
 #include "lib/config.h"
 #include "lib/cross.h"
 #include <dcp/cpl.h>
 #include <boost/test/unit_test.hpp>
 
 using std::vector;
+using std::string;
 using boost::shared_ptr;
 
 /** Make an encrypted DCP, import it and make a new unencrypted DCP */
@@ -47,13 +51,13 @@ BOOST_AUTO_TEST_CASE (import_dcp_test)
        A->set_name ("frobozz");
        A->set_interop (false);
 
-       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_CHECK (!wait_for_jobs ());
 
        A->make_dcp ();
-       wait_for_jobs ();
+       BOOST_CHECK (!wait_for_jobs ());
 
        dcp::DCP A_dcp ("build/test/import_dcp_test/" + A->dcp_name());
        A_dcp.read ();
@@ -62,11 +66,12 @@ BOOST_AUTO_TEST_CASE (import_dcp_test)
 
        dcp::EncryptedKDM 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::MODIFIED_TRANSITIONAL_1,
+               true, 0
                );
 
        shared_ptr<Film> B = new_test_film ("import_dcp_test2");
@@ -75,13 +80,15 @@ BOOST_AUTO_TEST_CASE (import_dcp_test)
        B->set_name ("frobozz");
        B->set_interop (false);
 
-       shared_ptr<DCPContent> d (new DCPContent (B, "build/test/import_dcp_test/" + A->dcp_name()));
-       d->add_kdm (kdm);
+       shared_ptr<DCPContent> d (new DCPContent("build/test/import_dcp_test/" + A->dcp_name()));
        B->examine_and_add_content (d);
-       wait_for_jobs ();
+       BOOST_CHECK (!wait_for_jobs ());
+       d->add_kdm (kdm);
+       JobManager::instance()->add (shared_ptr<Job> (new ExamineContentJob (B, d)));
+       BOOST_CHECK (!wait_for_jobs ());
 
        B->make_dcp ();
-       wait_for_jobs ();
+       BOOST_CHECK (!wait_for_jobs ());
 
        /* Should be 1s red, 1s green, 1s blue */
        check_dcp ("test/data/import_dcp_test2", "build/test/import_dcp_test2/" + B->dcp_name());