diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-06-04 11:26:47 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-06-04 11:26:47 +0100 |
| commit | 75de8898265611a4fc7068c40668ca697e6c1864 (patch) | |
| tree | 45d88d38a088b9bd2eb93b5040cbf2f12270b9f2 | |
| parent | 5670c00eee5ea3096e5fa79c17d81538914fff77 (diff) | |
A few more test fixes.
| -rw-r--r-- | test/ffmpeg_dcp_test.cc (renamed from test/dcp_test.cc) | 25 | ||||
| -rw-r--r-- | test/test.cc | 2 |
2 files changed, 16 insertions, 11 deletions
diff --git a/test/dcp_test.cc b/test/ffmpeg_dcp_test.cc index 0729e8cb7..06cb56e7d 100644 --- a/test/dcp_test.cc +++ b/test/ffmpeg_dcp_test.cc @@ -17,9 +17,13 @@ */ -BOOST_AUTO_TEST_CASE (make_dcp_test) +/** @file test/ffmpeg_dcp_test.cc + * @brief Test scaling and black-padding of images from a still-image source. + */ + +BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test) { - shared_ptr<Film> film = new_test_film ("make_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_ratio (Ratio::from_id ("185")); @@ -44,15 +48,16 @@ BOOST_AUTO_TEST_CASE (make_dcp_test) BOOST_CHECK_EQUAL (JobManager::instance()->errors(), false); } -/** Test Film::have_dcp(). Requires the output from make_dcp_test above */ -BOOST_AUTO_TEST_CASE (have_dcp_test) +/** Test Film::have_dcp(). Requires the output from ffmpeg_dcp_test above */ +BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test) { - boost::filesystem::path p = test_film_dir ("make_dcp_test"); - Film f (p.string ()); - BOOST_CHECK (f.have_dcp()); + boost::filesystem::path p = test_film_dir ("ffmpeg_dcp_test"); + shared_ptr<Film> f (new Film (p.string ())); + f->read_metadata (); + BOOST_CHECK (f->have_dcp()); - p /= f.dcp_name(); - p /= f.dcp_video_mxf_filename(); + p /= f->dcp_name(); + p /= f->dcp_video_mxf_filename(); boost::filesystem::remove (p); - BOOST_CHECK (!f.have_dcp ()); + BOOST_CHECK (!f->have_dcp ()); } diff --git a/test/test.cc b/test/test.cc index 7c7efd1a0..89cfa56df 100644 --- a/test/test.cc +++ b/test/test.cc @@ -159,7 +159,7 @@ check_dcp (string ref, string check) #include "film_metadata_test.cc" #include "stream_test.cc" #include "util_test.cc" -#include "dcp_test.cc" +#include "ffmpeg_dcp_test.cc" #include "frame_rate_test.cc" #include "job_test.cc" #include "client_server_test.cc" |