X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fffmpeg_dcp_test.cc;h=0d56f4290fd1788db1e655773717e5274df96e71;hp=234bf2c79b10bd8dafc5e74f71d2a36c98c22d3e;hb=b0d658e5c5b953b38e341a90518b5e7b2108811a;hpb=cc27c2716f755305d67f1e1ba828ecf37f8405dd

diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc
index 234bf2c79..0d56f4290 100644
--- a/test/ffmpeg_dcp_test.cc
+++ b/test/ffmpeg_dcp_test.cc
@@ -1,66 +1,81 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 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/>.
 
 */
 
+
 /** @file test/ffmpeg_dcp_test.cc
  *  @brief Test creation of a very simple DCP from some FFmpegContent (data/test.mp4).
+ *  @ingroup feature
  *
  *  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 "lib/video_content.h"
 #include "test.h"
 
-using boost::shared_ptr;
+
+using std::make_shared;
+using std::shared_ptr;
+
 
 BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
 {
-	shared_ptr<Film> film = new_test_film ("ffmpeg_dcp_test");
+	auto 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_scale (VideoContentScale (Ratio::from_id ("185")));
+	auto c = make_shared<FFmpegContent>("test/data/test.mp4");
 	film->examine_and_add_content (c);
 
-	wait_for_jobs ();
-	
+	BOOST_REQUIRE (!wait_for_jobs());
+
 	film->set_container (Ratio::from_id ("185"));
-	film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
-	film->make_dcp ();
-	film->write_metadata ();
+	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
+	make_and_verify_dcp (film);
 
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 }
 
-/** Briefly test Film::cpls().  Requires the output from ffmpeg_dcp_test above */
-BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test)
+
+/** Briefly test Film::cpls() */
+BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test, * boost::unit_test::depends_on("ffmpeg_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->cpls().empty());
-
-	p /= f->dcp_name();
-	p /= f->video_mxf_filename();
-	boost::filesystem::remove (p);
-	BOOST_CHECK (f->cpls().empty());
+	auto p = test_film_dir ("ffmpeg_dcp_test");
+	auto film = make_shared<Film>(p);
+	film->read_metadata ();
+	BOOST_CHECK (!film->cpls().empty());
+
+	p /= film->dcp_name();
+	auto 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 (film->cpls().empty());
 }