From 93cf75127355610facd5df8f8f84e1f38d47f4bb Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 21 Nov 2020 14:43:28 +0100 Subject: [PATCH] Test update for auto-addition of markers. --- test/data | 2 +- test/import_dcp_test.cc | 7 +++++-- test/video_mxf_content_test.cc | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/test/data b/test/data index d2e0ea48f..f47d073d6 160000 --- a/test/data +++ b/test/data @@ -1 +1 @@ -Subproject commit d2e0ea48f4cb2d9571d450aabd78c3d2699ecb7d +Subproject commit f47d073d6610bdb3ae0ad9d842c4d66a6e9a16d2 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 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 reloaded = dynamic_pointer_cast(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) { -- 2.30.2