Ignore parameters in PKL type strings when checking them.

[libdcp.git] / test / cpl_metadata_test.cc

diff --git a/test/cpl_metadata_test.cc b/test/cpl_metadata_test.cc
index 45afecb33d5b6f71068ad0aec14d84d131cd636d..82fc0c158a1b12089a5233c32934f405f4202e0b 100644 (file)
--- a/test/cpl_metadata_test.cc
+++ b/test/cpl_metadata_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2020-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -37,26 +37,29 @@
 #include "exceptions.h"
 #include "language_tag.h"
 #include "reel.h"
-#include "reel_subtitle_asset.h"
+#include "reel_smpte_subtitle_asset.h"
+#include "stream_operators.h"
 #include "test.h"
 #include <memory>
 #include <boost/test/unit_test.hpp>
 
 
 using std::list;
+using std::make_shared;
+using std::shared_ptr;
 using std::string;
 using std::vector;
-using std::shared_ptr;
 
 
 BOOST_AUTO_TEST_CASE (cpl_metadata_bad_values_test)
 {
-       dcp::CPL cpl("", dcp::ContentKind::FEATURE);
+       dcp::CPL cpl("", dcp::ContentKind::FEATURE, dcp::Standard::SMPTE);
        BOOST_CHECK_THROW (cpl.set_version_number(-1), dcp::BadSettingError);
 
-       vector<dcp::ContentVersion> cv;
-       cv.push_back (dcp::ContentVersion("same-id", "version 1"));
-       cv.push_back (dcp::ContentVersion("same-id", "version 2"));
+       vector<dcp::ContentVersion> cv = {
+               dcp::ContentVersion("same-id", "version 1"),
+               dcp::ContentVersion("same-id", "version 2")
+       };
        BOOST_CHECK_THROW (cpl.set_content_versions(cv), dcp::DuplicateIdError);
 }
 
@@ -157,7 +160,7 @@ BOOST_AUTO_TEST_CASE (luminance_test1)
 
 BOOST_AUTO_TEST_CASE (luminance_test2)
 {
-       shared_ptr<cxml::Document> doc (new cxml::Document("Luminance"));
+       auto doc = make_shared<cxml::Document>("Luminance");
 
        doc->read_string (
                "<Luminance units=\"candela-per-square-metre\">4.5</Luminance>"
@@ -171,7 +174,7 @@ BOOST_AUTO_TEST_CASE (luminance_test2)
 
 BOOST_AUTO_TEST_CASE (luminance_test3)
 {
-       shared_ptr<cxml::Document> doc (new cxml::Document("Luminance"));
+       auto doc = make_shared<cxml::Document>("Luminance");
 
        doc->read_string (
                "<Luminance units=\"candela-per-square-motre\">4.5</Luminance>"
@@ -183,7 +186,7 @@ BOOST_AUTO_TEST_CASE (luminance_test3)
 
 BOOST_AUTO_TEST_CASE (luminance_test4)
 {
-       shared_ptr<cxml::Document> doc (new cxml::Document("Luminance"));
+       auto doc = make_shared<cxml::Document>("Luminance");
 
        doc->read_string (
                "<Luminance units=\"candela-per-square-metre\">-4.5</Luminance>"
@@ -236,7 +239,7 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_read_test1)
        BOOST_REQUIRE (reels.front()->main_subtitle()->language());
        BOOST_CHECK_EQUAL (reels.front()->main_subtitle()->language().get(), "de-DE");
 
-       vector<string> asl = cpl.additional_subtitle_languages();
+       auto asl = cpl.additional_subtitle_languages();
        BOOST_REQUIRE_EQUAL (asl.size(), 2);
        BOOST_CHECK_EQUAL (asl[0], "en-US");
        BOOST_CHECK_EQUAL (asl[1], "fr-ZA");
@@ -250,12 +253,13 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_write_test1)
 {
        RNGFixer fix;
 
-       dcp::CPL cpl("", dcp::ContentKind::FEATURE);
+       dcp::CPL cpl("", dcp::ContentKind::FEATURE, dcp::Standard::SMPTE);
        cpl.set_issue_date ("2020-08-28T13:35:06+02:00");
 
-       vector<dcp::ContentVersion> cv;
-       cv.push_back (dcp::ContentVersion("some-id", "version 1"));
-       cv.push_back (dcp::ContentVersion("another-id", "version 2"));
+       vector<dcp::ContentVersion> cv = {
+               dcp::ContentVersion("some-id", "version 1"),
+               dcp::ContentVersion("another-id", "version 2")
+       };;
        cpl.set_content_versions (cv);
 
        cpl.set_full_content_title_text ("full-content-title");
@@ -282,7 +286,7 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_write_test1)
        cpl.set_main_picture_stored_area (dcp::Size(1998, 1080));
        cpl.set_main_picture_active_area (dcp::Size(1440, 1080));
 
-       shared_ptr<cxml::Document> doc (new cxml::Document("MainSubtitle"));
+       auto doc = make_shared<cxml::Document>("MainSubtitle");
 
        doc->read_string (
                "<MainSubtitle>"
@@ -298,9 +302,9 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_write_test1)
                "</MainSubtitle>"
                );
 
-       shared_ptr<dcp::Reel> reel(new dcp::Reel());
+       auto reel = make_shared<dcp::Reel>();
        reel->add (black_picture_asset("build/test/cpl_metadata_write_test1"));
-       reel->add (shared_ptr<dcp::ReelSubtitleAsset>(new dcp::ReelSubtitleAsset(doc)));
+       reel->add (make_shared<dcp::ReelSMPTESubtitleAsset>(doc));
        cpl.add (reel);
 
        vector<dcp::LanguageTag> lt;
@@ -308,7 +312,7 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_write_test1)
        lt.push_back(dcp::LanguageTag("fr-ZA"));
        cpl.set_additional_subtitle_languages (lt);
 
-       cpl.write_xml ("build/test/cpl_metadata_write_test1.xml", dcp::Standard::SMPTE, shared_ptr<dcp::CertificateChain>());
+       cpl.write_xml ("build/test/cpl_metadata_write_test1.xml", shared_ptr<dcp::CertificateChain>());
        check_xml (
                dcp::file_to_string("test/ref/cpl_metadata_test1.xml"),
                dcp::file_to_string("build/test/cpl_metadata_write_test1.xml"),
@@ -321,7 +325,7 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_write_test1)
 BOOST_AUTO_TEST_CASE (cpl_metadata_roundtrip_test_1)
 {
        dcp::CPL cpl ("test/ref/cpl_metadata_test1.xml");
-       cpl.write_xml ("build/test/cpl_metadata_roundtrip_test1.xml", dcp::Standard::SMPTE, shared_ptr<dcp::CertificateChain>());
+       cpl.write_xml ("build/test/cpl_metadata_roundtrip_test1.xml", shared_ptr<dcp::CertificateChain>());
        vector<string> ignore;
        ignore.push_back ("Id");
        check_xml (
@@ -337,7 +341,7 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_write_test2)
 {
        RNGFixer fix;
 
-       dcp::CPL cpl("", dcp::ContentKind::FEATURE);
+       dcp::CPL cpl("", dcp::ContentKind::FEATURE, dcp::Standard::SMPTE);
        cpl.set_issue_date ("2020-08-28T13:35:06+02:00");
        cpl.set_content_version (dcp::ContentVersion("id", "version"));
        cpl.set_issuer ("libdcp1.6.4devel");
@@ -359,7 +363,7 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_write_test2)
        reel->add (black_picture_asset("build/test/cpl_metadata_write_test1"));
        cpl.add (reel);
 
-       cpl.write_xml ("build/test/cpl_metadata_write_test2.xml", dcp::Standard::SMPTE, shared_ptr<dcp::CertificateChain>());
+       cpl.write_xml ("build/test/cpl_metadata_write_test2.xml", shared_ptr<dcp::CertificateChain>());
        check_xml (
                dcp::file_to_string("test/ref/cpl_metadata_test2.xml"),
                dcp::file_to_string("build/test/cpl_metadata_write_test2.xml"),
@@ -412,13 +416,11 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_read_test2)
 BOOST_AUTO_TEST_CASE (cpl_metadata_roundtrip_test_2)
 {
        dcp::CPL cpl ("test/ref/cpl_metadata_test2.xml");
-       cpl.write_xml ("build/test/cpl_metadata_roundtrip_test2.xml", dcp::Standard::SMPTE, shared_ptr<dcp::CertificateChain>());
-       vector<string> ignore;
-       ignore.push_back ("Id");
+       cpl.write_xml ("build/test/cpl_metadata_roundtrip_test2.xml", shared_ptr<dcp::CertificateChain>());
        check_xml (
                dcp::file_to_string("test/ref/cpl_metadata_test2.xml"),
                dcp::file_to_string("build/test/cpl_metadata_roundtrip_test2.xml"),
-               ignore
+               {"Id"}
                );
 }