X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_dcp_test.cc;h=1aa41967abe502c2772d94267db9d410cc42cb07;hb=326b767969a1a6aa64cc020b301a270eb5c2331c;hp=06cb56e7dd490436841b8f89abcfb8045f1c9778;hpb=89115db77729a2c99f1a09ff6a461720e16f889e;p=dcpomatic.git

diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc
index 06cb56e7d..1aa41967a 100644
--- a/test/ffmpeg_dcp_test.cc
+++ b/test/ffmpeg_dcp_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,46 +18,58 @@
 */
 
 /** @file test/ffmpeg_dcp_test.cc
- *  @brief Test scaling and black-padding of images from a still-image source.
+ *  @brief Test creation of a very simple DCP from some FFmpegContent (data/test.mp4).
+ *
+ *  Also a quick test of Film::have_dcp ().
  */
 
+#include <boost/test/unit_test.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/algorithm/string.hpp>
+#include "lib/film.h"
+#include "lib/ffmpeg_content.h"
+#include "lib/ratio.h"
+#include "lib/dcp_content_type.h"
+#include "test.h"
+
+using boost::shared_ptr;
+
 BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
 {
 	shared_ptr<Film> film = new_test_film ("ffmpeg_dcp_test");
 	film->set_name ("test_film2");
 	shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
-	c->set_ratio (Ratio::from_id ("185"));
 	film->examine_and_add_content (c);
 
-	/* Wait for the examine to finish */
-	while (JobManager::instance()->work_to_do ()) {
-		dcpomatic_sleep (1);
-	}
-
-	BOOST_CHECK_EQUAL (JobManager::instance()->errors(), false);
+	wait_for_jobs ();
+	
+	c->set_scale (VideoContentScale (Ratio::from_id ("185")));
 	
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
 	film->make_dcp ();
 	film->write_metadata ();
 
-	while (JobManager::instance()->work_to_do ()) {
-		dcpomatic_sleep (1);
-	}
-	
-	BOOST_CHECK_EQUAL (JobManager::instance()->errors(), false);
+	wait_for_jobs ();
 }
 
-/** Test Film::have_dcp().  Requires the output from ffmpeg_dcp_test above */
+/** Briefly test Film::cpls().  Requires the output from ffmpeg_dcp_test above */
 BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test)
 {
 	boost::filesystem::path p = test_film_dir ("ffmpeg_dcp_test");
 	shared_ptr<Film> f (new Film (p.string ()));
 	f->read_metadata ();
-	BOOST_CHECK (f->have_dcp());
+	BOOST_CHECK (!f->cpls().empty());
 
 	p /= f->dcp_name();
-	p /= f->dcp_video_mxf_filename();
-	boost::filesystem::remove (p);
-	BOOST_CHECK (!f->have_dcp ());
+	boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (p);
+	while (i != boost::filesystem::directory_iterator() && !boost::algorithm::starts_with (i->path().leaf().string(), "j2c")) {
+		++i;
+	}
+
+	if (i != boost::filesystem::directory_iterator ()) {
+		boost::filesystem::remove (i->path ());
+	}
+	
+	BOOST_CHECK (f->cpls().empty());
 }