X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fimport_dcp_test.cc;h=cd0396d075ed3ecfdcbc503c528fac15adee54d2;hb=8edc349253daf5eb0d9ceb75f467cdbbc668f27a;hp=b2420b1fe490c585ff0741f8f677bf1492aebf1e;hpb=c008066160d85b9ec9e5485375d7baaa5d27bda2;p=dcpomatic.git

diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc
index b2420b1fe..cd0396d07 100644
--- a/test/import_dcp_test.cc
+++ b/test/import_dcp_test.cc
@@ -1,24 +1,24 @@
 /*
     Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include <boost/test/unit_test.hpp>
-#include <dcp/cpl.h>
+#include "test.h"
 #include "lib/film.h"
 #include "lib/dcp_subtitle_content.h"
 #include "lib/ratio.h"
@@ -26,8 +26,11 @@
 #include "lib/dcp_content.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/config.h"
-#include "test.h"
+#include "lib/cross.h"
+#include <dcp/cpl.h>
+#include <boost/test/unit_test.hpp>
 
+using std::vector;
 using boost::shared_ptr;
 
 /** Make an encrypted DCP, import it and make a new unencrypted DCP */
@@ -39,7 +42,7 @@ BOOST_AUTO_TEST_CASE (import_dcp_test)
 	A->set_name ("frobozz");
 
 	shared_ptr<FFmpegContent> c (new FFmpegContent (A, "test/data/test.mp4"));
-	A->examine_and_add_content (c, true);
+	A->examine_and_add_content (c);
 	A->set_encrypted (true);
 	wait_for_jobs ();
 
@@ -49,9 +52,12 @@ BOOST_AUTO_TEST_CASE (import_dcp_test)
 	dcp::DCP A_dcp ("build/test/import_dcp_test/" + A->dcp_name());
 	A_dcp.read ();
 
+	Config::instance()->set_decryption_chain (shared_ptr<dcp::CertificateChain> (new dcp::CertificateChain (openssl_path ())));
+
 	dcp::EncryptedKDM kdm = A->make_kdm (
-		Config::instance()->decryption_certificate(),
-		A_dcp.cpls().front()->file (),
+		Config::instance()->decryption_chain()->leaf (),
+		vector<dcp::Certificate> (),
+		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
@@ -64,11 +70,12 @@ BOOST_AUTO_TEST_CASE (import_dcp_test)
 
 	shared_ptr<DCPContent> d (new DCPContent (B, "build/test/import_dcp_test/" + A->dcp_name()));
 	d->add_kdm (kdm);
-	B->examine_and_add_content (d, true);
+	B->examine_and_add_content (d);
 	wait_for_jobs ();
 
 	B->make_dcp ();
 	wait_for_jobs ();
 
-	check_dcp ("build/test/import_dcp_test2/" + B->dcp_name(), "test/data/import_dcp_test2");
+	/* Should be 1s red, 1s green, 1s blue */
+	check_dcp ("test/data/import_dcp_test2", "build/test/import_dcp_test2/" + B->dcp_name());
 }