Remove XMLMetadata use from tests.

diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index 21ed2f6c1ff05e5d7775add3736b2fb7558558fa..d21ba318ec5e950a25fdfe1f474a893ffa8150ec 100644 (file)
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -60,12 +60,10 @@ BOOST_AUTO_TEST_CASE (dcp_test1)
 {
        RNGFixer fixer;
 
-       dcp::XMLMetadata xml_meta;
-       xml_meta.annotation_text = "Created by libdcp";
-       xml_meta.issuer = "OpenDCP 0.0.25";
-       xml_meta.creator = "OpenDCP 0.0.25";
-       xml_meta.issue_date = "2012-07-17T04:45:18+00:00";
-       make_simple("build/test/DCP/dcp_test1")->write_xml (dcp::SMPTE, xml_meta.issuer, xml_meta.creator, xml_meta.issue_date, xml_meta.annotation_text);
+       make_simple("build/test/DCP/dcp_test1")->write_xml(
+               dcp::SMPTE, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp"
+               );
+
        /* build/test/DCP/dcp_test1 is checked against test/ref/DCP/dcp_test1 by run/tests */
 }
 
@@ -75,11 +73,6 @@ BOOST_AUTO_TEST_CASE (dcp_test2)
        RNGFixer fix;
 
        /* Some known metadata */
-       dcp::XMLMetadata xml_meta;
-       xml_meta.annotation_text = "A Test DCP";
-       xml_meta.issuer = "OpenDCP 0.0.25";
-       xml_meta.creator = "OpenDCP 0.0.25";
-       xml_meta.issue_date = "2012-07-17T04:45:18+00:00";
        dcp::MXFMetadata mxf_meta;
        mxf_meta.company_name = "OpenDCP";
        mxf_meta.product_name = "OpenDCP";
@@ -92,10 +85,10 @@ BOOST_AUTO_TEST_CASE (dcp_test2)
        shared_ptr<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE));
        cpl->set_content_version_id ("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00");
        cpl->set_content_version_label_text ("81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00");
-       cpl->set_issuer (xml_meta.issuer);
-       cpl->set_creator (xml_meta.creator);
-       cpl->set_issue_date (xml_meta.issue_date);
-       cpl->set_annotation_text (xml_meta.annotation_text);
+       cpl->set_issuer ("OpenDCP 0.0.25");
+       cpl->set_creator ("OpenDCP 0.0.25");
+       cpl->set_issue_date ("2012-07-17T04:45:18+00:00");
+       cpl->set_annotation_text ("A Test DCP");
 
        shared_ptr<dcp::StereoPictureAsset> mp (new dcp::StereoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE));
        mp->set_metadata (mxf_meta);
@@ -139,8 +132,7 @@ BOOST_AUTO_TEST_CASE (dcp_test2)
 
        d.add (cpl);
 
-       xml_meta.annotation_text = "Created by libdcp";
-       d.write_xml (dcp::SMPTE, xml_meta.issuer, xml_meta.creator, xml_meta.issue_date, xml_meta.annotation_text);
+       d.write_xml (dcp::SMPTE, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp");
 
        /* build/test/DCP/dcp_test2 is checked against test/ref/DCP/dcp_test2 by run/tests */
 }
@@ -179,11 +171,6 @@ BOOST_AUTO_TEST_CASE (dcp_test5)
        RNGFixer fix;
 
        /* Some known metadata */
-       dcp::XMLMetadata xml_meta;
-       xml_meta.annotation_text = "A Test DCP";
-       xml_meta.issuer = "OpenDCP 0.0.25";
-       xml_meta.creator = "OpenDCP 0.0.25";
-       xml_meta.issue_date = "2012-07-17T04:45:18+00:00";
        dcp::MXFMetadata mxf_meta;
        mxf_meta.company_name = "OpenDCP";
        mxf_meta.product_name = "OpenDCP";
@@ -196,10 +183,10 @@ BOOST_AUTO_TEST_CASE (dcp_test5)
        shared_ptr<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE));
        cpl->set_content_version_id ("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00");
        cpl->set_content_version_label_text ("81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00");
-       cpl->set_issuer (xml_meta.issuer);
-       cpl->set_creator (xml_meta.creator);
-       cpl->set_issue_date (xml_meta.issue_date);
-       cpl->set_annotation_text (xml_meta.annotation_text);
+       cpl->set_issuer ("OpenDCP 0.0.25");
+       cpl->set_creator ("OpenDCP 0.0.25");
+       cpl->set_issue_date ("2012-07-17T04:45:18+00:00");
+       cpl->set_annotation_text ("A Test DCP");
 
        shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE));
        mp->set_metadata (mxf_meta);
@@ -245,8 +232,7 @@ BOOST_AUTO_TEST_CASE (dcp_test5)
 
        d.add (cpl);
 
-       xml_meta.annotation_text = "Created by libdcp";
-       d.write_xml (dcp::SMPTE, xml_meta.issuer, xml_meta.creator, xml_meta.issue_date, xml_meta.annotation_text);
+       d.write_xml (dcp::SMPTE, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp");
 
        /* build/test/DCP/dcp_test5 is checked against test/ref/DCP/dcp_test5 by run/tests */
 }
@@ -270,12 +256,10 @@ BOOST_AUTO_TEST_CASE (dcp_test7)
 {
        RNGFixer fix;
 
-       dcp::XMLMetadata xml_meta;
-       xml_meta.annotation_text = "Created by libdcp";
-       xml_meta.issuer = "OpenDCP 0.0.25";
-       xml_meta.creator = "OpenDCP 0.0.25";
-       xml_meta.issue_date = "2012-07-17T04:45:18+00:00";
-       make_simple("build/test/DCP/dcp_test7")->write_xml(dcp::INTEROP, xml_meta.issuer, xml_meta.creator, xml_meta.issue_date, xml_meta.annotation_text);
+       make_simple("build/test/DCP/dcp_test7")->write_xml(
+               dcp::INTEROP,  "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp"
+               );
+
        /* build/test/DCP/dcp_test7 is checked against test/ref/DCP/dcp_test7 by run/tests */
 }
 

diff --git a/test/encryption_test.cc b/test/encryption_test.cc
index 3bb52c2fb700a4bdd47a174456ef846958ee054d..913bd206154232de57e967b95fd88f638e0ac22f 100644 (file)
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -72,12 +72,6 @@ BOOST_AUTO_TEST_CASE (encryption_test)
        mxf_metadata.product_name = "OpenDCP";
        mxf_metadata.product_version = "0.0.25";
 
-       dcp::XMLMetadata xml_metadata;
-       xml_metadata.annotation_text = "A Test DCP";
-       xml_metadata.issuer = "OpenDCP 0.0.25";
-       xml_metadata.creator = "OpenDCP 0.0.25";
-       xml_metadata.issue_date = "2012-07-17T04:45:18+00:00";
-
        boost::filesystem::remove_all ("build/test/DCP/encryption_test");
        boost::filesystem::create_directories ("build/test/DCP/encryption_test");
        dcp::DCP d ("build/test/DCP/encryption_test");
@@ -133,15 +127,14 @@ BOOST_AUTO_TEST_CASE (encryption_test)
                                                 )));
        cpl->set_content_version_id ("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00");
        cpl->set_content_version_label_text ("81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00");
-       cpl->set_issuer (xml_metadata.issuer);
-       cpl->set_creator (xml_metadata.creator);
-       cpl->set_issue_date (xml_metadata.issue_date);
-       cpl->set_annotation_text (xml_metadata.annotation_text);
+       cpl->set_annotation_text ("A Test DCP");
+       cpl->set_issuer ("OpenDCP 0.0.25");
+       cpl->set_creator ("OpenDCP 0.0.25");
+       cpl->set_issue_date ("2012-07-17T04:45:18+00:00");
 
        d.add (cpl);
 
-       xml_metadata.annotation_text = "Created by libdcp";
-       d.write_xml (dcp::SMPTE, xml_metadata.issuer, xml_metadata.creator, xml_metadata.issue_date, xml_metadata.annotation_text, signer);
+       d.write_xml (dcp::SMPTE, "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp", signer);
 
        dcp::DecryptedKDM kdm (
                cpl,

diff --git a/test/write_subtitle_test.cc b/test/write_subtitle_test.cc
index da2ec35c9d74b2bf0125c8208c70f90e7bebcd08..808df31b081fdf070691ee03ecb715a1e4b4fc4f 100644 (file)
--- a/test/write_subtitle_test.cc
+++ b/test/write_subtitle_test.cc
@@ -361,23 +361,22 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test3)
        shared_ptr<dcp::Reel> reel (new dcp::Reel());
        reel->add(shared_ptr<dcp::ReelSubtitleAsset>(new dcp::ReelSubtitleAsset(c, dcp::Fraction(24, 1), 6046, 0)));
 
-       dcp::XMLMetadata xml_meta;
-       xml_meta.issue_date = "2018-09-02T04:45:18+00:00";
-       xml_meta.issuer = "libdcp";
-       xml_meta.creator = "libdcp";
-       xml_meta.annotation_text = "Created by libdcp";
+       string const issue_date = "2018-09-02T04:45:18+00:00";
+       string const issuer = "libdcp";
+       string const creator = "libdcp";
+       string const annotation_text = "Created by libdcp";
 
        shared_ptr<dcp::CPL> cpl (new dcp::CPL ("My film", dcp::FEATURE));
        cpl->add (reel);
-       cpl->set_issuer (xml_meta.issuer);
-       cpl->set_creator (xml_meta.creator);
-       cpl->set_issue_date (xml_meta.issue_date);
-       cpl->set_annotation_text (xml_meta.annotation_text);
+       cpl->set_issuer (issuer);
+       cpl->set_creator (creator);
+       cpl->set_issue_date (issue_date);
+       cpl->set_annotation_text (annotation_text);
        cpl->set_content_version_label_text ("foo");
 
        dcp::DCP dcp ("build/test/write_interop_subtitle_test3");
        dcp.add (cpl);
-       dcp.write_xml (dcp::INTEROP, xml_meta.issuer, xml_meta.creator, xml_meta.issue_date, xml_meta.annotation_text);
+       dcp.write_xml (dcp::INTEROP, issuer, creator, issue_date, annotation_text);
 
        check_xml (
                dcp::file_to_string("test/ref/write_interop_subtitle_test3/subs.xml"),