X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fscaling_test.cc;h=93c994741f50e4926993ed8e4b2c7fe84396ea35;hp=ab64928ce8a656e0dfb7befbacf3eedb5522678a;hb=54af50c3b8e9082f9751e809d63540c51197a4a1;hpb=a30100943a7a750a0c26fbcfc841b6ade4ac36c4

diff --git a/test/scaling_test.cc b/test/scaling_test.cc
index ab64928ce..93c994741 100644
--- a/test/scaling_test.cc
+++ b/test/scaling_test.cc
@@ -1,39 +1,47 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include "imagemagick_content.h"
-
 /** @file test/scaling_test.cc
  *  @brief Test scaling and black-padding of images from a still-image source.
+ *  @ingroup specific
  */
 
+#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 "lib/video_content.h"
+#include "test.h"
+
+using std::string;
 using boost::shared_ptr;
 
-static void scaling_test_for (shared_ptr<Film> film, shared_ptr<VideoContent> content, string image, string container)
+static void scaling_test_for (shared_ptr<Film> film, shared_ptr<Content> content, string image, string container)
 {
-	content->set_ratio (Ratio::from_id (image));
+	content->video->set_scale (VideoContentScale (Ratio::from_id (image)));
 	film->set_container (Ratio::from_id (container));
+	film->set_interop (false);
 	film->make_dcp ();
 
-	while (JobManager::instance()->work_to_do ()) {}
-
-	BOOST_CHECK (!JobManager::instance()->errors());
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	boost::filesystem::path ref;
 	ref = "test";
@@ -52,21 +60,27 @@ 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("test/data/simple_testcard_640x480.png"));
 
 	film->examine_and_add_content (imc);
-	while (JobManager::instance()->work_to_do ()) {}
-	
-	imc->set_video_length (1);
 
+	BOOST_REQUIRE (!wait_for_jobs());
+
+	imc->video->set_length (1);
+
+	/* F-133: 133 image in a flat container */
 	scaling_test_for (film, imc, "133", "185");
+	/* F: flat image in a flat container */
 	scaling_test_for (film, imc, "185", "185");
+	/* F-S: scope image in a flat container */
 	scaling_test_for (film, imc, "239", "185");
 
+	/* S-133: 133 image in a scope container */
 	scaling_test_for (film, imc, "133", "239");
+	/* S-F: flat image in a scope container */
 	scaling_test_for (film, imc, "185", "239");
+	/* S: scope image in a scope container */
 	scaling_test_for (film, imc, "239", "239");
 }
-