C++11 tidying.

[dcpomatic.git] / test / film_metadata_test.cc

diff --git a/test/film_metadata_test.cc b/test/film_metadata_test.cc
index 4230fb7ebf518b2533f81bdeb332d2c2f31119a0..5fcb4b195eedcf714d53e9e1c9dce4d18b903b82 100644 (file)
--- 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");