Spacing tweaks; rename ImageMagick -> StillImage.

[dcpomatic.git] / test / scaling_test.cc

diff --git a/test/scaling_test.cc b/test/scaling_test.cc
index dba611043793d1c53713929bd008133ec35346bd..8d00be72a33cee4df2cb482a62c092e1f1b4b8ca 100644 (file)
--- a/test/scaling_test.cc
+++ b/test/scaling_test.cc
@@ -17,12 +17,18 @@
 
 */
 
-#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)
@@ -31,9 +37,7 @@ static void scaling_test_for (shared_ptr<Film> film, shared_ptr<VideoContent> co
        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";
@@ -54,10 +58,11 @@ BOOST_AUTO_TEST_CASE (scaling_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);