X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2F4k_test.cc;h=4db576cfc0d1db1f4c2aa464b2144b492242ab5c;hp=fa5b33bb921feb348e4a0d6ad83fda54c40411b7;hb=39fb8198febde1937019db1c300ec363aab5aa56;hpb=946dbad9821e676f1d8fdc5abba459da54b8e84c

diff --git a/test/4k_test.cc b/test/4k_test.cc
index fa5b33bb9..4db576cfc 100644
--- a/test/4k_test.cc
+++ b/test/4k_test.cc
@@ -1,54 +1,69 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-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/>.
 
 */
 
+
+/** @defgroup completedcp Complete builds of DCPs */
+
 /** @file  test/4k_test.cc
  *  @brief Run a 4K encode from a simple input.
+ *  @ingroup completedcp
  *
  *  The output is checked against test/data/4k_test.
  */
 
+
 #include <boost/test/unit_test.hpp>
 #include "lib/film.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/dcp_content_type.h"
+#include "lib/video_content.h"
 #include "lib/ratio.h"
+#include "lib/dcpomatic_log.h"
 #include "test.h"
 
-using boost::shared_ptr;
+
+using std::shared_ptr;
+using std::make_shared;
+
 
 BOOST_AUTO_TEST_CASE (fourk_test)
 {
-	shared_ptr<Film> film = new_test_film ("4k_test");
+	auto film = new_test_film ("4k_test");
+	LogSwitcher ls (film->log());
 	film->set_name ("4k_test");
-	shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
-	c->set_scale (VideoContentScale (Ratio::from_id ("185")));
-	film->set_resolution (RESOLUTION_4K);
+	auto c = make_shared<FFmpegContent>("test/data/test.mp4");
+	film->set_resolution (Resolution::FOUR_K);
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
 	film->set_container (Ratio::from_id ("185"));
 	film->examine_and_add_content (c);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
-	film->make_dcp ();
-	wait_for_jobs ();
+	make_and_verify_dcp (
+		film,
+		{
+			dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE,
+			dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE
+		});
 
-	boost::filesystem::path p (test_film_dir ("4k_test"));
+	boost::filesystem::path p (test_film_dir("4k_test"));
 	p /= film->dcp_name ();
 
-	check_dcp ("test/data/4k_test", p.string ());
+	check_dcp ("test/data/4k_test", p.string());
 }