From 21702cc5f4b0e6fc7114f9fffb118246fbfda2e2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 9 May 2021 22:07:32 +0200 Subject: [PATCH] C++11 tidying. --- test/film_metadata_test.cc | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/test/film_metadata_test.cc b/test/film_metadata_test.cc index 4230fb7eb..5fcb4b195 100644 --- a/test/film_metadata_test.cc +++ b/test/film_metadata_test.cc @@ -23,18 +23,26 @@ * @ingroup feature */ -#include -#include -#include -#include "lib/film.h" + +#include "lib/content.h" +#include "lib/content_factory.h" +#include "lib/dcp_content.h" #include "lib/dcp_content_type.h" +#include "lib/film.h" #include "lib/ratio.h" +#include "lib/text_content.h" #include "test.h" +#include +#include +#include + using std::string; using std::list; +using std::make_shared; using std::shared_ptr; + BOOST_AUTO_TEST_CASE (film_metadata_test) { auto film = new_test_film ("film_metadata_test"); @@ -55,12 +63,10 @@ BOOST_AUTO_TEST_CASE (film_metadata_test) film->set_release_territory (dcp::LanguageTag::RegionSubtag("US")); film->write_metadata (); - list ignore; - ignore.push_back ("Key"); - ignore.push_back ("ContextID"); + list ignore = { "Key", "ContextID" }; check_xml ("test/data/metadata.xml.ref", dir.string() + "/metadata.xml", ignore); - shared_ptr g (new Film (dir)); + auto g = make_shared(dir); g->read_metadata (); BOOST_CHECK_EQUAL (g->name(), "fred"); -- 2.30.2