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->cpls().empty());
+ shared_ptr<Film> film (new Film (p.string ()));
+ film->read_metadata ();
+ BOOST_CHECK (!film->cpls().empty());
- p /= f->dcp_name();
- 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);
- }
+ p /= film->dcp_name();
+ 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;
}
- BOOST_CHECK (f->cpls().empty());
+
+ if (i != boost::filesystem::directory_iterator ()) {
+ boost::filesystem::remove (i->path ());
+ }
+
+ BOOST_CHECK (film->cpls().empty());
}