X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fround_trip_test.cc;h=45b2cbadd361a8425a75cc9a5fee3b8c9b12e678;hb=ea629ead13e819b4ff5d5b5eba7b57520e8107e3;hp=39db697b2c301bf97a6397b10774df10a7f0a403;hpb=3ac1487997a968278c69728bd5eaa5dcf03b66ca;p=libdcp.git

diff --git a/test/round_trip_test.cc b/test/round_trip_test.cc
index 39db697b..45b2cbad 100644
--- a/test/round_trip_test.cc
+++ b/test/round_trip_test.cc
@@ -17,10 +17,10 @@
 
 */
 
-#include "certificates.h"
+#include "certificate.h"
 #include "decrypted_kdm.h"
 #include "encrypted_kdm.h"
-#include "signer.h"
+#include "certificate_chain.h"
 #include "mono_picture_asset.h"
 #include "sound_asset.h"
 #include "reel.h"
@@ -32,7 +32,7 @@
 #include "reel_picture_asset.h"
 #include "reel_mono_picture_asset.h"
 #include "file.h"
-#include "xyz_image.h"
+#include "openjpeg_image.h"
 #include "rgb_xyz.h"
 #include "colour_conversion.h"
 #include <boost/test/unit_test.hpp>
@@ -40,13 +40,14 @@
 #include <iostream>
 
 using std::list;
+using std::vector;
 using boost::shared_ptr;
 using boost::scoped_array;
 
 /** Build an encrypted picture asset and a KDM for it and check that the KDM can be decrypted */
 BOOST_AUTO_TEST_CASE (round_trip_test)
 {
-	shared_ptr<dcp::Signer> signer (new dcp::Signer ("openssl"));
+	shared_ptr<dcp::CertificateChain> signer (new dcp::CertificateChain ("openssl"));
 
 	boost::filesystem::path work_dir = "build/test/round_trip_test";
 	boost::filesystem::create_directory (work_dir);
@@ -81,10 +82,10 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
 
 	boost::filesystem::path const kdm_file = work_dir / "kdm.xml";
 
-	kdm_A.encrypt(signer, signer->certificates().leaf(), dcp::MODIFIED_TRANSITIONAL_1).as_xml (kdm_file);
+	kdm_A.encrypt(signer, signer->leaf(), vector<dcp::Certificate>(), dcp::MODIFIED_TRANSITIONAL_1).as_xml (kdm_file);
 
 	/* Reload the KDM, using our private key to decrypt it */
-	dcp::DecryptedKDM kdm_B (dcp::EncryptedKDM (dcp::file_to_string (kdm_file)), signer->key ());
+	dcp::DecryptedKDM kdm_B (dcp::EncryptedKDM (dcp::file_to_string (kdm_file)), signer->key().get ());
 
 	/* Check that the decrypted KDMKeys are the same as the ones we started with */
 	BOOST_CHECK_EQUAL (kdm_A.keys().size(), kdm_B.keys().size());
@@ -106,12 +107,12 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
 	BOOST_CHECK (!kdm_B.keys().empty ());
 	asset_B->set_key (kdm_B.keys().front().key());
 
-	shared_ptr<dcp::XYZImage> xyz_A = asset_A->get_frame(0)->xyz_image ();
-	shared_ptr<dcp::XYZImage> xyz_B = asset_B->get_frame(0)->xyz_image ();
+	shared_ptr<dcp::OpenJPEGImage> xyz_A = asset_A->get_frame(0)->xyz_image ();
+	shared_ptr<dcp::OpenJPEGImage> xyz_B = asset_B->get_frame(0)->xyz_image ();
 
 	scoped_array<uint8_t> frame_A (new uint8_t[xyz_A->size().width * xyz_A->size().height * 4]);
 	dcp::xyz_to_rgba (xyz_A, dcp::ColourConversion::srgb_to_xyz(), frame_A.get());
-	
+
 	scoped_array<uint8_t> frame_B (new uint8_t[xyz_B->size().width * xyz_B->size().height * 4]);
 	dcp::xyz_to_rgba (xyz_B, dcp::ColourConversion::srgb_to_xyz(), frame_B.get());