C++11 tidying.

[dcpomatic.git] / test / 4k_test.cc

diff --git a/test/4k_test.cc b/test/4k_test.cc
index 0fe492133f5dc0e4a3bc546fa30667620375b79b..4db576cfc0d1db1f4c2aa464b2144b492242ab5c 100644 (file)
--- a/test/4k_test.cc
+++ b/test/4k_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,7 +18,8 @@
 
 */
 
-/** @defgroup completedcp Complete builds of DCPs with various characteristics, testing broad areas of code */
+
+/** @defgroup completedcp Complete builds of DCPs */
 
 /** @file  test/4k_test.cc
  *  @brief Run a 4K encode from a simple input.
@@ -27,6 +28,7 @@
  *  The output is checked against test/data/4k_test.
  */
 
+
 #include <boost/test/unit_test.hpp>
 #include "lib/film.h"
 #include "lib/ffmpeg_content.h"
@@ -36,25 +38,32 @@
 #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("test/data/test.mp4"));
-       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);
        BOOST_REQUIRE (!wait_for_jobs());
 
-       film->make_dcp ();
-       BOOST_REQUIRE (!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());
 }