Remove ReelEncryptableAsset and tidy up a bit.

[libdcp.git] / test / combine_test.cc

diff --git a/test/combine_test.cc b/test/combine_test.cc
index 99795592d6596903e7540a5918d0a3da64b27b2f..0dcfd2d3f742737a30d9b6fae1a107a95379e6ed 100644 (file)
--- a/test/combine_test.cc
+++ b/test/combine_test.cc
@@ -175,8 +175,8 @@ BOOST_AUTO_TEST_CASE (combine_two_dcps_with_same_asset_filenames_test)
        using namespace boost::filesystem;
        boost::filesystem::path const out = "build/test/combine_two_dcps_with_same_asset_filenames_test";
 
-       shared_ptr<dcp::DCP> second = make_simple ("build/test/combine_input2");
-       second->write_xml (dcp::Standard::SMPTE);
+       auto second = make_simple ("build/test/combine_input2");
+       second->write_xml ();
 
        remove_all (out);
        vector<path> inputs;
@@ -196,15 +196,13 @@ BOOST_AUTO_TEST_CASE (combine_two_dcps_with_interop_subs_test)
        boost::filesystem::path const out = "build/test/combine_two_dcps_with_interop_subs_test";
 
        auto first = make_simple_with_interop_subs ("build/test/combine_input1");
-       first->write_xml (dcp::Standard::INTEROP);
+       first->write_xml ();
 
        auto second = make_simple_with_interop_subs ("build/test/combine_input2");
-       second->write_xml (dcp::Standard::INTEROP);
+       second->write_xml ();
 
        remove_all (out);
-       vector<path> inputs;
-       inputs.push_back ("build/test/combine_input1");
-       inputs.push_back ("build/test/combine_input2");
+       vector<path> inputs = {"build/test/combine_input1", "build/test/combine_input2"};
        dcp::combine (inputs, out);
 
        check_no_errors (out);
@@ -218,11 +216,11 @@ BOOST_AUTO_TEST_CASE (combine_two_dcps_with_smpte_subs_test)
        using namespace boost::filesystem;
        boost::filesystem::path const out = "build/test/combine_two_dcps_with_smpte_subs_test";
 
-       shared_ptr<dcp::DCP> first = make_simple_with_smpte_subs ("build/test/combine_input1");
-       first->write_xml (dcp::Standard::SMPTE);
+       auto first = make_simple_with_smpte_subs ("build/test/combine_input1");
+       first->write_xml ();
 
-       shared_ptr<dcp::DCP> second = make_simple_with_smpte_subs ("build/test/combine_input2");
-       second->write_xml (dcp::Standard::SMPTE);
+       auto second = make_simple_with_smpte_subs ("build/test/combine_input2");
+       second->write_xml ();
 
        remove_all (out);
        vector<path> inputs;
@@ -241,11 +239,11 @@ BOOST_AUTO_TEST_CASE (combine_two_dcps_with_interop_ccaps_test)
        using namespace boost::filesystem;
        boost::filesystem::path const out = "build/test/combine_two_dcps_with_interop_ccaps_test";
 
-       shared_ptr<dcp::DCP> first = make_simple_with_interop_ccaps ("build/test/combine_input1");
-       first->write_xml (dcp::Standard::INTEROP);
+       auto first = make_simple_with_interop_ccaps ("build/test/combine_input1");
+       first->write_xml ();
 
-       shared_ptr<dcp::DCP> second = make_simple_with_interop_ccaps ("build/test/combine_input2");
-       second->write_xml (dcp::Standard::INTEROP);
+       auto second = make_simple_with_interop_ccaps ("build/test/combine_input2");
+       second->write_xml ();
 
        remove_all (out);
        vector<path> inputs;
@@ -264,11 +262,11 @@ BOOST_AUTO_TEST_CASE (combine_two_dcps_with_smpte_ccaps_test)
        using namespace boost::filesystem;
        boost::filesystem::path const out = "build/test/combine_two_dcps_with_interop_ccaps_test";
 
-       shared_ptr<dcp::DCP> first = make_simple_with_smpte_ccaps ("build/test/combine_input1");
-       first->write_xml (dcp::Standard::SMPTE);
+       auto first = make_simple_with_smpte_ccaps ("build/test/combine_input1");
+       first->write_xml ();
 
-       shared_ptr<dcp::DCP> second = make_simple_with_smpte_ccaps ("build/test/combine_input2");
-       second->write_xml (dcp::Standard::SMPTE);
+       auto second = make_simple_with_smpte_ccaps ("build/test/combine_input2");
+       second->write_xml ();
 
        remove_all (out);
        vector<path> inputs;
@@ -287,11 +285,11 @@ BOOST_AUTO_TEST_CASE (combine_two_multi_reel_dcps)
        using namespace boost::filesystem;
        boost::filesystem::path const out = "build/test/combine_two_multi_reel_dcps";
 
-       shared_ptr<dcp::DCP> first = make_simple ("build/test/combine_input1", 4);
-       first->write_xml (dcp::Standard::SMPTE);
+       auto first = make_simple ("build/test/combine_input1", 4);
+       first->write_xml ();
 
-       shared_ptr<dcp::DCP> second = make_simple ("build/test/combine_input2", 4);
-       second->write_xml (dcp::Standard::SMPTE);
+       auto second = make_simple ("build/test/combine_input2", 4);
+       second->write_xml ();
 
        remove_all (out);
        vector<path> inputs;
@@ -309,17 +307,17 @@ BOOST_AUTO_TEST_CASE (combine_two_dcps_with_shared_asset)
        using namespace boost::filesystem;
        boost::filesystem::path const out = "build/test/combine_two_dcps_with_shared_asset";
 
-       shared_ptr<dcp::DCP> first = make_simple ("build/test/combine_input1", 1);
-       first->write_xml (dcp::Standard::SMPTE);
+       auto first = make_simple ("build/test/combine_input1", 1);
+       first->write_xml ();
 
        remove_all ("build/test/combine_input2");
-       shared_ptr<dcp::DCP> second(new dcp::DCP("build/test/combine_input2"));
+       auto second = make_shared<dcp::DCP>("build/test/combine_input2");
 
        dcp::MXFMetadata mxf_meta;
        mxf_meta.company_name = "OpenDCP";
        mxf_meta.product_version = "0.0.25";
 
-       auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER);
+       auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE);
        cpl->set_content_version (
                dcp::ContentVersion("urn:uuid:75ac29aa-42ac-1234-ecae-49251abefd11","content-version-label-text")
                );
@@ -335,7 +333,7 @@ BOOST_AUTO_TEST_CASE (combine_two_dcps_with_shared_asset)
        reel->add (simple_markers());
        cpl->add (reel);
        second->add (cpl);
-       second->write_xml (dcp::Standard::SMPTE);
+       second->write_xml ();
 
        remove_all (out);
        vector<path> inputs;
@@ -355,7 +353,7 @@ BOOST_AUTO_TEST_CASE (combine_two_dcps_with_duplicated_asset)
        boost::filesystem::path const out = "build/test/combine_two_dcps_with_duplicated_asset";
 
        auto first = make_simple ("build/test/combine_input1", 1);
-       first->write_xml (dcp::Standard::SMPTE);
+       first->write_xml ();
 
        remove_all ("build/test/combine_input2");
        auto second = make_shared<dcp::DCP>("build/test/combine_input2");
@@ -364,7 +362,7 @@ BOOST_AUTO_TEST_CASE (combine_two_dcps_with_duplicated_asset)
        mxf_meta.company_name = "OpenDCP";
        mxf_meta.product_version = "0.0.25";
 
-       auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER);
+       auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE);
        cpl->set_content_version (
                dcp::ContentVersion("urn:uuid:75ac29aa-42ac-1234-ecae-49251abefd11","content-version-label-text")
                );
@@ -384,7 +382,7 @@ BOOST_AUTO_TEST_CASE (combine_two_dcps_with_duplicated_asset)
        reel->add (simple_markers());
        cpl->add (reel);
        second->add (cpl);
-       second->write_xml (dcp::Standard::SMPTE);
+       second->write_xml ();
 
        remove_all (out);
        vector<path> inputs;