3cb5a4c2064d4cf4d8cbdca75a84615a6c56fb7c from master; use j2c_uuid and pcm_uuid for...

[dcpomatic.git] / test / ffmpeg_dcp_test.cc

diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc
index 234bf2c79b10bd8dafc5e74f71d2a36c98c22d3e..add1cb425640950924a130577523df3dd29a33f1 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 ();
@@ -60,7 +62,11 @@ BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test)
        BOOST_CHECK (!f->cpls().empty());
 
        p /= f->dcp_name();
-       p /= f->video_mxf_filename();
-       boost::filesystem::remove (p);
+       for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (p); i != boost::filesystem::directory_iterator(); ++i) {
+               if (boost::algorithm::starts_with (i->path().string(), "j2c")) {
+                       p /= i->path ();
+                       boost::filesystem::remove (p);
+               }
+       }
        BOOST_CHECK (f->cpls().empty());
 }