X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ffind_missing_test.cc;h=51ae5800cb0506d431a8454c3fa2f50391f59407;hb=dc5e11944a30a9d381dc0e67cf657c5f2cb65845;hp=1bc4bef01f83e657b8b9c22d3f90764757db6e5e;hpb=266e3f1b80d1263ff3cc8b3afaecd6ca1f88983b;p=dcpomatic.git diff --git a/test/find_missing_test.cc b/test/find_missing_test.cc index 1bc4bef01..51ae5800c 100644 --- a/test/find_missing_test.cc +++ b/test/find_missing_test.cc @@ -49,13 +49,13 @@ BOOST_AUTO_TEST_CASE (find_missing_test_with_single_files) /* Make a film with that content */ auto film = new_test_film2 (name + "_film", { - content_factory(content_dir / "A.png").front(), - content_factory(content_dir / "B.png").front(), - content_factory(content_dir / "C.png").front() + content_factory(content_dir / "A.png")[0], + content_factory(content_dir / "B.png")[0], + content_factory(content_dir / "C.png")[0] }); film->write_metadata (); - /* Move the content somewhere eles */ + /* Move the content somewhere else */ auto moved = path("build/test") / path(name + "_moved"); remove_all (moved); rename (content_dir, moved); @@ -137,8 +137,9 @@ BOOST_AUTO_TEST_CASE (find_missing_test_with_multiple_files_one_incorrect) /* Corrupt one of the files in the moved content, so that it should not be found in the find_missing * step */ - remove (moved / "cpl_80daeb7a-57d8-4a70-abeb-cd92ddac1527.xml"); - copy ("test/data/scaling_test_133_185/ASSETMAP.xml", moved / "cpl_80daeb7a-57d8-4a70-abeb-cd92ddac1527.xml"); + auto cpl = find_file(moved, "cpl_"); + remove (cpl); + copy ("test/data/scaling_test_133_185/ASSETMAP.xml", cpl); /* The film's contents should be invalid */ for (auto content: film->content()) {