summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-08-19 17:04:28 +0200
committerCarl Hetherington <cth@carlh.net>2020-09-20 19:29:21 +0200
commit3f806092b5d0f60fe4c7e40399cf1f7ec0e535ec (patch)
treec8a052cbaf8b4f8bc4ffb05753d05f4d6887315f /test
parentf9078ac398e0765e39f503cdc5bed406d45e0c36 (diff)
Remove XMLMetadata from DCP::write_xml and DCP::write_assetmap.
Diffstat (limited to 'test')
-rw-r--r--test/dcp_test.cc8
-rw-r--r--test/encryption_test.cc2
-rw-r--r--test/write_subtitle_test.cc2
3 files changed, 6 insertions, 6 deletions
diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index 30c5ca30..21ed2f6c 100644
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -65,7 +65,7 @@ BOOST_AUTO_TEST_CASE (dcp_test1)
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);
+ 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);
/* build/test/DCP/dcp_test1 is checked against test/ref/DCP/dcp_test1 by run/tests */
}
@@ -140,7 +140,7 @@ BOOST_AUTO_TEST_CASE (dcp_test2)
d.add (cpl);
xml_meta.annotation_text = "Created by libdcp";
- d.write_xml (dcp::SMPTE, xml_meta);
+ d.write_xml (dcp::SMPTE, xml_meta.issuer, xml_meta.creator, xml_meta.issue_date, xml_meta.annotation_text);
/* build/test/DCP/dcp_test2 is checked against test/ref/DCP/dcp_test2 by run/tests */
}
@@ -246,7 +246,7 @@ BOOST_AUTO_TEST_CASE (dcp_test5)
d.add (cpl);
xml_meta.annotation_text = "Created by libdcp";
- d.write_xml (dcp::SMPTE, xml_meta);
+ d.write_xml (dcp::SMPTE, xml_meta.issuer, xml_meta.creator, xml_meta.issue_date, xml_meta.annotation_text);
/* build/test/DCP/dcp_test5 is checked against test/ref/DCP/dcp_test5 by run/tests */
}
@@ -275,7 +275,7 @@ BOOST_AUTO_TEST_CASE (dcp_test7)
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);
+ 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);
/* 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 4b9e525e..3bb52c2f 100644
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -141,7 +141,7 @@ BOOST_AUTO_TEST_CASE (encryption_test)
d.add (cpl);
xml_metadata.annotation_text = "Created by libdcp";
- d.write_xml (dcp::SMPTE, xml_metadata, signer);
+ d.write_xml (dcp::SMPTE, xml_metadata.issuer, xml_metadata.creator, xml_metadata.issue_date, xml_metadata.annotation_text, signer);
dcp::DecryptedKDM kdm (
cpl,
diff --git a/test/write_subtitle_test.cc b/test/write_subtitle_test.cc
index 266a1039..da2ec35c 100644
--- a/test/write_subtitle_test.cc
+++ b/test/write_subtitle_test.cc
@@ -377,7 +377,7 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test3)
dcp::DCP dcp ("build/test/write_interop_subtitle_test3");
dcp.add (cpl);
- dcp.write_xml (dcp::INTEROP, xml_meta);
+ dcp.write_xml (dcp::INTEROP, xml_meta.issuer, xml_meta.creator, xml_meta.issue_date, xml_meta.annotation_text);
check_xml (
dcp::file_to_string("test/ref/write_interop_subtitle_test3/subs.xml"),