diff options
| m--------- | test/data | 0 | ||||
| -rw-r--r-- | test/import_dcp_test.cc | 7 | ||||
| -rw-r--r-- | test/video_mxf_content_test.cc | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/test/data b/test/data -Subproject d2e0ea48f4cb2d9571d450aabd78c3d2699ecb7 +Subproject f47d073d6610bdb3ae0ad9d842c4d66a6e9a16d diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc index 671fc8cf7..cb485e68a 100644 --- a/test/import_dcp_test.cc +++ b/test/import_dcp_test.cc @@ -125,7 +125,10 @@ BOOST_AUTO_TEST_CASE (import_dcp_markers_test) 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()); @@ -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); - BOOST_CHECK_EQUAL (reloaded->markers().size(), 3U); + BOOST_CHECK_EQUAL (reloaded->markers().size(), 4U); markers = reloaded->markers(); BOOST_REQUIRE(markers.find(dcp::FFOC) != markers.end()); diff --git a/test/video_mxf_content_test.cc b/test/video_mxf_content_test.cc index 91d03778c..84c3f4733 100644 --- a/test/video_mxf_content_test.cc +++ b/test/video_mxf_content_test.cc @@ -35,7 +35,7 @@ using boost::shared_ptr; using boost::dynamic_pointer_cast; -static boost::filesystem::path ref_mxf = "test/data/scaling_test_185_185/j2c_bff270b1-cf7c-483b-be22-265aee6097ba.mxf"; +static boost::filesystem::path ref_mxf = "test/data/scaling_test_185_185/j2c_c75af074-2809-453c-9192-6affb76b4ba3.mxf"; static void note (dcp::NoteType, std::string) { |