X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fscaling_test.cc;h=cdf1653cdf84a7c78b40f1518a3d81516a600063;hb=402eeecead89fe0703b641cdc4cecc29db18311e;hp=ab64928ce8a656e0dfb7befbacf3eedb5522678a;hpb=764dfcd5aea143d1246873667e646f86d99e33a4;p=dcpomatic.git

diff --git a/test/scaling_test.cc b/test/scaling_test.cc
index ab64928ce..cdf1653cd 100644
--- a/test/scaling_test.cc
+++ b/test/scaling_test.cc
@@ -17,23 +17,27 @@
 
 */
 
-#include "imagemagick_content.h"
+#include <boost/test/unit_test.hpp>
+#include "lib/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)
 {
-	content->set_ratio (Ratio::from_id (image));
+	content->set_scale (VideoContentScale (Ratio::from_id (image)));
 	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";
@@ -52,12 +56,13 @@ static void scaling_test_for (shared_ptr<Film> film, shared_ptr<VideoContent> co
 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_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
 	film->set_name ("scaling_test");
-	shared_ptr<ImageMagickContent> imc (new ImageMagickContent (film, "test/data/simple_testcard_640x480.png"));
+	shared_ptr<ImageContent> imc (new ImageContent (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);