X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fimport_dcp_test.cc;h=71689f613c6f2663b377dcbc234079ce3d0275ed;hb=3f9b394d57e750624d361f5daae6db77079f862a;hp=3dc9333da0d617af18447be43ce2ec34bee23467;hpb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;p=dcpomatic.git

diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc
index 3dc9333da..71689f613 100644
--- a/test/import_dcp_test.cc
+++ b/test/import_dcp_test.cc
@@ -18,22 +18,29 @@
 
 */
 
+/** @file  test/import_dcp_test.cc
+ *  @brief Test import of encrypted DCPs.
+ *  @ingroup specific
+ */
+
 #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>
-#include <boost/make_shared.hpp>
 
 using std::vector;
+using std::string;
 using boost::shared_ptr;
-using boost::make_shared;
 
 /** Make an encrypted DCP, import it and make a new unencrypted DCP */
 BOOST_AUTO_TEST_CASE (import_dcp_test)
@@ -42,41 +49,46 @@ BOOST_AUTO_TEST_CASE (import_dcp_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 (false);
 
-	shared_ptr<FFmpegContent> c = make_shared<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 ();
 
-	Config::instance()->set_decryption_chain (make_shared<dcp::CertificateChain> (openssl_path ()));
+	Config::instance()->set_decryption_chain (shared_ptr<dcp::CertificateChain> (new dcp::CertificateChain (openssl_path ())));
 
 	dcp::EncryptedKDM kdm = A->make_kdm (
 		Config::instance()->decryption_chain()->leaf (),
-		vector<dcp::Certificate> (),
-		A_dcp.cpls().front()->file (),
+		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");
 	B->set_container (Ratio::from_id ("185"));
 	B->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	B->set_name ("frobozz");
+	B->set_interop (false);
 
-	shared_ptr<DCPContent> d = boost::make_shared<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());