C++11 tidying.

[libdcp.git] / test / cpl_ratings_test.cc

diff --git a/test/cpl_ratings_test.cc b/test/cpl_ratings_test.cc
index 17500a1348e2dc395b48cf5ce829790389e7cdd2..2c1efa5803ae9f78d0737839029c6086e37a387f 100644 (file)
--- a/test/cpl_ratings_test.cc
+++ b/test/cpl_ratings_test.cc
@@ -31,35 +31,35 @@
     files in the program, then also delete it here.
 */
 
+
 #include "cpl.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
+
 using std::list;
 using std::string;
 using std::vector;
 using std::shared_ptr;
+using std::make_shared;
+
 
 BOOST_AUTO_TEST_CASE (cpl_ratings)
 {
        dcp::CPL cpl ("annotation", dcp::ContentKind::FEATURE, dcp::Standard::SMPTE);
 
-       vector<dcp::Rating> ratings;
-       ratings.push_back (dcp::Rating("http://www.mpaa.org/2003-ratings", "PG-13"));
-       ratings.push_back (dcp::Rating("http://www.movielabs.com/md/ratings/GB/BBFC/1/12A%3C/Agency", "12A"));
+       vector<dcp::Rating> ratings = {
+               dcp::Rating("http://www.mpaa.org/2003-ratings", "PG-13"),
+               dcp::Rating("http://www.movielabs.com/md/ratings/GB/BBFC/1/12A%3C/Agency", "12A")
+       };
        cpl.set_ratings (ratings);
 
-       shared_ptr<dcp::Reel> reel(new dcp::Reel());
+       auto reel = make_shared<dcp::Reel>();
        cpl.add (reel);
 
        cpl.write_xml ("build/test/cpl_ratings.xml", {});
 
-       vector<string> ignore;
-       ignore.push_back ("Id");
-       ignore.push_back ("Issuer");
-       ignore.push_back ("Creator");
-       ignore.push_back ("IssueDate");
-       ignore.push_back ("LabelText");
+       vector<string> ignore = { "Id", "Issuer", "Creator", "IssueDate", "LabelText" };
        check_xml (
                dcp::file_to_string("build/test/cpl_ratings.xml"),
                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
@@ -96,6 +96,5 @@ BOOST_AUTO_TEST_CASE (cpl_ratings)
                );
 
        dcp::CPL cpl2 ("build/test/cpl_ratings.xml");
-       auto ratings2 = cpl2.ratings ();
-       BOOST_TEST(ratings == ratings2);
+       BOOST_TEST(ratings == cpl2.ratings());
 }