summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-08-26 23:02:10 +0200
committerCarl Hetherington <cth@carlh.net>2020-09-21 21:57:18 +0200
commit0fa60920228c591f1183149d79c88302d3ce01fb (patch)
treeafedcb6e3dbae9011e246b21c23839af687939c4 /test
parente18addc9029f56c67aa40254bcfa40f8b072866f (diff)
Add ContentVersion class.
Diffstat (limited to 'test')
-rw-r--r--test/dcp_test.cc10
-rw-r--r--test/encryption_test.cc5
-rw-r--r--test/write_subtitle_test.cc4
3 files changed, 12 insertions, 7 deletions
diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index d21ba318..a6efe024 100644
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -83,8 +83,9 @@ BOOST_AUTO_TEST_CASE (dcp_test2)
boost::filesystem::create_directories ("build/test/DCP/dcp_test2");
dcp::DCP d ("build/test/DCP/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_content_version (
+ dcp::ContentVersion("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00", "81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00")
+ );
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");
@@ -181,8 +182,9 @@ BOOST_AUTO_TEST_CASE (dcp_test5)
boost::filesystem::create_directories ("build/test/DCP/dcp_test5");
dcp::DCP d ("build/test/DCP/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_content_version (
+ dcp::ContentVersion("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00", "81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00")
+ );
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");
diff --git a/test/encryption_test.cc b/test/encryption_test.cc
index 913bd206..c452c07b 100644
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -125,8 +125,9 @@ BOOST_AUTO_TEST_CASE (encryption_test)
shared_ptr<dcp::ReelSoundAsset> (new dcp::ReelSoundAsset (ms, 0)),
shared_ptr<dcp::ReelSubtitleAsset> ()
)));
- 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_content_version (
+ dcp::ContentVersion("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00", "81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00")
+ );
cpl->set_annotation_text ("A Test DCP");
cpl->set_issuer ("OpenDCP 0.0.25");
cpl->set_creator ("OpenDCP 0.0.25");
diff --git a/test/write_subtitle_test.cc b/test/write_subtitle_test.cc
index 808df31b..0a6e6a82 100644
--- a/test/write_subtitle_test.cc
+++ b/test/write_subtitle_test.cc
@@ -372,7 +372,9 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test3)
cpl->set_creator (creator);
cpl->set_issue_date (issue_date);
cpl->set_annotation_text (annotation_text);
- cpl->set_content_version_label_text ("foo");
+ dcp::ContentVersion cv = cpl->content_version ();
+ cv.label_text = "foo";
+ cpl->set_content_version (cv);
dcp::DCP dcp ("build/test/write_interop_subtitle_test3");
dcp.add (cpl);