projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use make_shared<>.
[dcpomatic.git]
/
test
/
import_dcp_test.cc
diff --git
a/test/import_dcp_test.cc
b/test/import_dcp_test.cc
index 80cd9c3df35d200873a8b86907ab11908ae47eb2..3dc9333da0d617af18447be43ce2ec34bee23467 100644
(file)
--- a/
test/import_dcp_test.cc
+++ b/
test/import_dcp_test.cc
@@
-1,24
+1,24
@@
/*
Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
/*
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.
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
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"
#include "lib/film.h"
#include "lib/dcp_subtitle_content.h"
#include "lib/ratio.h"
@@
-26,9
+26,14
@@
#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>
+#include <boost/make_shared.hpp>
+using std::vector;
using boost::shared_ptr;
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)
/** Make an encrypted DCP, import it and make a new unencrypted DCP */
BOOST_AUTO_TEST_CASE (import_dcp_test)
@@
-38,7
+43,7
@@
BOOST_AUTO_TEST_CASE (import_dcp_test)
A->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
A->set_name ("frobozz");
A->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
A->set_name ("frobozz");
- shared_ptr<FFmpegContent> c
(new FFmpegContent (A, "test/data/test.mp4")
);
+ shared_ptr<FFmpegContent> c
= make_shared<FFmpegContent> (A, "test/data/test.mp4"
);
A->examine_and_add_content (c);
A->set_encrypted (true);
wait_for_jobs ();
A->examine_and_add_content (c);
A->set_encrypted (true);
wait_for_jobs ();
@@
-49,8
+54,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 (make_shared<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"),
@@
-62,7
+70,7
@@
BOOST_AUTO_TEST_CASE (import_dcp_test)
B->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
B->set_name ("frobozz");
B->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
B->set_name ("frobozz");
- shared_ptr<DCPContent> d
(new DCPContent (B, "build/test/import_dcp_test/" + A->dcp_name()
));
+ shared_ptr<DCPContent> d
= boost::make_shared<DCPContent> (B, "build/test/import_dcp_test/" + A->dcp_name(
));
d->add_kdm (kdm);
B->examine_and_add_content (d);
wait_for_jobs ();
d->add_kdm (kdm);
B->examine_and_add_content (d);
wait_for_jobs ();
@@
-70,5
+78,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());
}
}