A number of unit test fixes.

[dcpomatic.git] / test / import_dcp_test.cc

diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc
index 3f6f41b55af551a9a4c044282b59bb0b7e50fb37..403c1c992320edf01e635f5d6457048f79748ea3 100644 (file)
--- a/test/import_dcp_test.cc
+++ b/test/import_dcp_test.cc
@@ -1,24 +1,29 @@
 /*
     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>
+/** @file  test/import_dcp_test.cc
+ *  @brief Test import of encrypted DCPs.
+ *  @ingroup specific
+ */
+
+#include "test.h"
 #include "lib/film.h"
 #include "lib/dcp_subtitle_content.h"
 #include "lib/ratio.h"
@@ -26,8 +31,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 */
@@ -37,6 +45,7 @@ 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 (new FFmpegContent (A, "test/data/test.mp4"));
        A->examine_and_add_content (c);
@@ -49,9 +58,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
@@ -61,6 +73,7 @@ BOOST_AUTO_TEST_CASE (import_dcp_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 (false);
 
        shared_ptr<DCPContent> d (new DCPContent (B, "build/test/import_dcp_test/" + A->dcp_name()));
        d->add_kdm (kdm);