summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-05-09 22:07:32 +0200
committerCarl Hetherington <cth@carlh.net>2021-05-09 22:07:32 +0200
commit21702cc5f4b0e6fc7114f9fffb118246fbfda2e2 (patch)
tree1d1b5bd6125955e094c6d6d4ceb43ce8b08a4cc8
parent1ac807fa50ea6e20e821d59bb00a397a4812c3e4 (diff)
C++11 tidying.
-rw-r--r--test/film_metadata_test.cc22
1 files 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 <boost/test/unit_test.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/date_time.hpp>
-#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 <boost/date_time.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/test/unit_test.hpp>
+
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<string> ignore;
- ignore.push_back ("Key");
- ignore.push_back ("ContextID");
+ list<string> ignore = { "Key", "ContextID" };
check_xml ("test/data/metadata.xml.ref", dir.string() + "/metadata.xml", ignore);
- shared_ptr<Film> g (new Film (dir));
+ auto g = make_shared<Film>(dir);
g->read_metadata ();
BOOST_CHECK_EQUAL (g->name(), "fred");