projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix some label alignment.
[dcpomatic.git]
/
test
/
import_dcp_test.cc
diff --git
a/test/import_dcp_test.cc
b/test/import_dcp_test.cc
index 2f33f93f55c3f66c3dada323cdcbe9823a6397ee..05b020e1c1240a6b7ceacac7799fd2db386603dc 100644
(file)
--- a/
test/import_dcp_test.cc
+++ b/
test/import_dcp_test.cc
@@
-20,7
+20,7
@@
/** @file test/import_dcp_test.cc
* @brief Test import of encrypted DCPs.
/** @file test/import_dcp_test.cc
* @brief Test import of encrypted DCPs.
- * @ingroup
specific
+ * @ingroup
feature
*/
#include "test.h"
*/
#include "test.h"
@@
-43,8
+43,8
@@
using std::vector;
using std::string;
using std::map;
using std::vector;
using std::string;
using std::map;
-using
boost
::shared_ptr;
-using
boost
::dynamic_pointer_cast;
+using
std
::shared_ptr;
+using
std
::dynamic_pointer_cast;
/** 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)
@@
-125,7
+125,10
@@
BOOST_AUTO_TEST_CASE (import_dcp_markers_test)
BOOST_REQUIRE (!wait_for_jobs());
film2->write_metadata ();
BOOST_REQUIRE (!wait_for_jobs());
film2->write_metadata ();
- BOOST_CHECK_EQUAL (imported->markers().size(), 3U);
+ /* When import_dcp_markers_test was made a LFOC marker will automatically
+ * have been added.
+ */
+ BOOST_CHECK_EQUAL (imported->markers().size(), 4U);
map<dcp::Marker, dcpomatic::ContentTime> markers = imported->markers();
BOOST_REQUIRE(markers.find(dcp::FFOC) != markers.end());
map<dcp::Marker, dcpomatic::ContentTime> markers = imported->markers();
BOOST_REQUIRE(markers.find(dcp::FFOC) != markers.end());
@@
-142,7
+145,7
@@
BOOST_AUTO_TEST_CASE (import_dcp_markers_test)
shared_ptr<DCPContent> reloaded = dynamic_pointer_cast<DCPContent>(film3->content().front());
BOOST_REQUIRE (reloaded);
shared_ptr<DCPContent> reloaded = dynamic_pointer_cast<DCPContent>(film3->content().front());
BOOST_REQUIRE (reloaded);
- BOOST_CHECK_EQUAL (reloaded->markers().size(),
3
U);
+ BOOST_CHECK_EQUAL (reloaded->markers().size(),
4
U);
markers = reloaded->markers();
BOOST_REQUIRE(markers.find(dcp::FFOC) != markers.end());
markers = reloaded->markers();
BOOST_REQUIRE(markers.find(dcp::FFOC) != markers.end());