X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fthreed_test.cc;h=b12eb328d661230e412cb8afefc94700d20d56af;hp=ce1df88e381ce32404e3420a7634f9c370682b1e;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hpb=20c70c93a38551842721ddee2e08c7b33a7bb924

diff --git a/test/threed_test.cc b/test/threed_test.cc
index ce1df88e3..b12eb328d 100644
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -37,7 +37,7 @@
 #include <iostream>
 
 using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 /** Basic sanity check of 3D_LEFT_RIGHT */
 BOOST_AUTO_TEST_CASE (threed_test1)
@@ -106,9 +106,9 @@ BOOST_AUTO_TEST_CASE (threed_test3)
 BOOST_AUTO_TEST_CASE (threed_test4)
 {
 	shared_ptr<Film> film = new_test_film2 ("threed_test4");
-	shared_ptr<FFmpegContent> L (new FFmpegContent(TestPaths::private_data / "LEFT_TEST_DCP3D4K.mov"));
+	shared_ptr<FFmpegContent> L (new FFmpegContent(TestPaths::private_data() / "LEFT_TEST_DCP3D4K.mov"));
 	film->examine_and_add_content (L);
-	shared_ptr<FFmpegContent> R (new FFmpegContent(TestPaths::private_data / "RIGHT_TEST_DCP3D4K.mov"));
+	shared_ptr<FFmpegContent> R (new FFmpegContent(TestPaths::private_data() / "RIGHT_TEST_DCP3D4K.mov"));
 	film->examine_and_add_content (R);
 	BOOST_REQUIRE (!wait_for_jobs());
 
@@ -131,9 +131,9 @@ BOOST_AUTO_TEST_CASE (threed_test4)
 BOOST_AUTO_TEST_CASE (threed_test5)
 {
 	shared_ptr<Film> film = new_test_film2 ("threed_test5");
-	shared_ptr<FFmpegContent> L (new FFmpegContent(TestPaths::private_data / "boon_telly.mkv"));
+	shared_ptr<FFmpegContent> L (new FFmpegContent(TestPaths::private_data() / "boon_telly.mkv"));
 	film->examine_and_add_content (L);
-	shared_ptr<FFmpegContent> R (new FFmpegContent(TestPaths::private_data / "boon_telly.mkv"));
+	shared_ptr<FFmpegContent> R (new FFmpegContent(TestPaths::private_data() / "boon_telly.mkv"));
 	film->examine_and_add_content (R);
 	BOOST_REQUIRE (!wait_for_jobs());
 
@@ -175,8 +175,11 @@ BOOST_AUTO_TEST_CASE (threed_test6)
 /** Check 2D content set as being 3D; this should give an informative error */
 BOOST_AUTO_TEST_CASE (threed_test7)
 {
+	using boost::filesystem::path;
+
 	shared_ptr<Film> film = new_test_film2 ("threed_test7");
-	shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/red_24.mp4"));
+	path const content_path = "test/data/red_24.mp4";
+	shared_ptr<FFmpegContent> c (new FFmpegContent(content_path));
 	film->examine_and_add_content (c);
 	BOOST_REQUIRE (!wait_for_jobs());
 
@@ -195,20 +198,20 @@ BOOST_AUTO_TEST_CASE (threed_test7)
 	while (signal_manager->ui_idle ()) {}
 
 	std::cout << "Here's the jobs:\n";
-	BOOST_FOREACH (shared_ptr<Job> i, jm->_jobs) {
+	for (auto i: jm->_jobs) {
 		std::cout << i->name() << " " << i->status() << " " << i->is_new() << " " << i->running() << " " << i->finished() << " " << i->finished_ok() << " " << i->finished_in_error() << "\n";
 	}
 
 	BOOST_REQUIRE (jm->errors());
 	shared_ptr<Job> failed;
-	BOOST_FOREACH (shared_ptr<Job> i, jm->_jobs) {
+	for (auto i: jm->_jobs) {
 		if (i->finished_in_error()) {
 			BOOST_REQUIRE (!failed);
 			failed = i;
 		}
 	}
 	BOOST_REQUIRE (failed);
-	BOOST_CHECK_EQUAL (failed->error_summary(), "The content file test/data/red_24.mp4 is set as 3D but does not appear to contain 3D images.  Please set it to 2D.  You can still make a 3D DCP from this content by ticking the 3D option in the DCP video tab.");
+	BOOST_CHECK_EQUAL (failed->error_summary(), String::compose("The content file %1 is set as 3D but does not appear to contain 3D images.  Please set it to 2D.  You can still make a 3D DCP from this content by ticking the 3D option in the DCP video tab.", content_path.string()));
 
 	while (signal_manager->ui_idle ()) {}