projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
[dcpomatic.git]
/
test
/
import_dcp_test.cc
diff --git
a/test/import_dcp_test.cc
b/test/import_dcp_test.cc
index 80cd9c3df35d200873a8b86907ab11908ae47eb2..32e31da475d1301ccd1d777de2f62a2d320c4312 100644
(file)
--- a/
test/import_dcp_test.cc
+++ b/
test/import_dcp_test.cc
@@
-17,8
+17,7
@@
*/
*/
-#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"
#include "lib/film.h"
#include "lib/dcp_subtitle_content.h"
#include "lib/ratio.h"
@@
-26,8
+25,11
@@
#include "lib/dcp_content.h"
#include "lib/ffmpeg_content.h"
#include "lib/config.h"
#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 */
using boost::shared_ptr;
/** Make an encrypted DCP, import it and make a new unencrypted DCP */
@@
-49,8
+51,11
@@
BOOST_AUTO_TEST_CASE (import_dcp_test)
dcp::DCP A_dcp ("build/test/import_dcp_test/" + A->dcp_name());
A_dcp.read ();
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 (
dcp::EncryptedKDM kdm = A->make_kdm (
- Config::instance()->decryption_certificate(),
+ Config::instance()->decryption_chain()->leaf (),
+ vector<dcp::Certificate> (),
A_dcp.cpls().front()->file (),
dcp::LocalTime ("2014-07-21T00:00:00+00:00"),
dcp::LocalTime ("2024-07-21T00:00:00+00:00"),
A_dcp.cpls().front()->file (),
dcp::LocalTime ("2014-07-21T00:00:00+00:00"),
dcp::LocalTime ("2024-07-21T00:00:00+00:00"),
@@
-70,5
+75,6
@@
BOOST_AUTO_TEST_CASE (import_dcp_test)
B->make_dcp ();
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());
}
}