test/data updates.

[dcpomatic.git] / test / ffmpeg_dcp_test.cc

diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc
index 1c897bcd93a90bc158fcbbb9232debe7e72a1529..1aa41967abe502c2772d94267db9d410cc42cb07 100644 (file)
--- a/test/ffmpeg_dcp_test.cc
+++ b/test/ffmpeg_dcp_test.cc
@@ -25,6 +25,7 @@
 
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/algorithm/string.hpp>
 #include "lib/film.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/ratio.h"
@@ -38,11 +39,12 @@ BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
        shared_ptr<Film> film = new_test_film ("ffmpeg_dcp_test");
        film->set_name ("test_film2");
        shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
-       c->set_scale (VideoContentScale (Ratio::from_id ("185")));
        film->examine_and_add_content (c);
 
        wait_for_jobs ();
        
+       c->set_scale (VideoContentScale (Ratio::from_id ("185")));
+       
        film->set_container (Ratio::from_id ("185"));
        film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
        film->make_dcp ();
@@ -51,16 +53,23 @@ BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
        wait_for_jobs ();
 }
 
-/** Test Film::have_dcp().  Requires the output from ffmpeg_dcp_test above */
+/** Briefly test Film::cpls().  Requires the output from ffmpeg_dcp_test above */
 BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test)
 {
        boost::filesystem::path p = test_film_dir ("ffmpeg_dcp_test");
        shared_ptr<Film> f (new Film (p.string ()));
        f->read_metadata ();
-       BOOST_CHECK (!f->dcps().empty());
+       BOOST_CHECK (!f->cpls().empty());
 
        p /= f->dcp_name();
-       p /= f->video_mxf_filename();
-       boost::filesystem::remove (p);
-       BOOST_CHECK (f->dcps().empty());
+       boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (p);
+       while (i != boost::filesystem::directory_iterator() && !boost::algorithm::starts_with (i->path().leaf().string(), "j2c")) {
+               ++i;
+       }
+
+       if (i != boost::filesystem::directory_iterator ()) {
+               boost::filesystem::remove (i->path ());
+       }
+       
+       BOOST_CHECK (f->cpls().empty());
 }