Add ContentVersion class.

[libdcp.git] / test / encryption_test.cc

diff --git a/test/encryption_test.cc b/test/encryption_test.cc
index 214bc26327f915256da7709d9413725b7464873d..c452c07bc3df71f60078abe4b9749b13b30d068c 100644 (file)
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -65,19 +65,13 @@ BOOST_AUTO_TEST_CASE (encryption_test)
        boost::filesystem::remove_all ("build/test/signer");
        boost::filesystem::create_directory ("build/test/signer");
 
-       Kumu::cth_test = true;
+       RNGFixer fix;
 
        dcp::MXFMetadata mxf_metadata;
        mxf_metadata.company_name = "OpenDCP";
        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");
@@ -131,19 +125,22 @@ 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_metadata (xml_metadata);
+       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");
+       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, 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,
                key,
-               dcp::LocalTime ("2013-01-01T00:00:00+00:00"),
+               dcp::LocalTime ("2016-01-01T00:00:00+00:00"),
                dcp::LocalTime ("2017-01-08T00:00:00+00:00"),
                "libdcp",
                "test",