*/
-#include "imagemagick_content.h"
+#include <boost/test/unit_test.hpp>
+#include "lib/still_image_content.h"
+#include "lib/ratio.h"
+#include "lib/film.h"
+#include "lib/dcp_content_type.h"
+#include "test.h"
/** @file test/scaling_test.cc
* @brief Test scaling and black-padding of images from a still-image source.
*/
+using std::string;
using boost::shared_ptr;
static void scaling_test_for (shared_ptr<Film> film, shared_ptr<VideoContent> content, string image, string container)
film->set_container (Ratio::from_id (container));
film->make_dcp ();
- while (JobManager::instance()->work_to_do ());
-
- BOOST_CHECK (!JobManager::instance()->errors());
+ wait_for_jobs ();
boost::filesystem::path ref;
ref = "test";
shared_ptr<Film> film = new_test_film ("scaling_test");
film->set_dcp_content_type (DCPContentType::from_dci_name ("FTR"));
film->set_name ("scaling_test");
- shared_ptr<ImageMagickContent> imc (new ImageMagickContent (film, "test/data/simple_testcard_640x480.png"));
+ shared_ptr<StillImageContent> imc (new StillImageContent (film, "test/data/simple_testcard_640x480.png"));
film->examine_and_add_content (imc);
- while (JobManager::instance()->work_to_do ());
+
+ wait_for_jobs ();
imc->set_video_length (1);