Bv2.1 9.1: PKL annotation text must match CPL ContentTitleText if there is only one...

[libdcp.git] / test / combine_test.cc

diff --git a/test/combine_test.cc b/test/combine_test.cc
index 92949cf26ca867f15a4999e6f92cb6e36222a5e4..62b7ffd50f39583b5321a3dfc302a85b1c0e80f0 100644 (file)
--- a/test/combine_test.cc
+++ b/test/combine_test.cc
@@ -157,7 +157,14 @@ BOOST_AUTO_TEST_CASE (combine_single_dcp_test)
        remove_all (out);
        vector<path> inputs;
        inputs.push_back ("test/ref/DCP/dcp_test1");
-       dcp::combine (inputs, out);
+       dcp::combine (
+               inputs,
+               out,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "A Test DCP"
+               );
 
        check_no_errors (out);
        check_combined (inputs, out);
@@ -318,6 +325,11 @@ BOOST_AUTO_TEST_CASE (combine_two_dcps_with_shared_asset)
        cpl->set_content_version (
                dcp::ContentVersion("urn:uuid:75ac29aa-42ac-1234-ecae-49251abefd11","content-version-label-text")
                );
+       cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
+       cpl->set_main_sound_sample_rate (48000);
+       cpl->set_main_picture_stored_area (dcp::Size(1998, 1080));
+       cpl->set_main_picture_active_area (dcp::Size(1440, 1080));
+       cpl->set_version_number(1);
 
        shared_ptr<dcp::ReelMonoPictureAsset> pic(new dcp::ReelMonoPictureAsset(simple_picture("build/test/combine_input2", ""), 0));
        shared_ptr<dcp::ReelSoundAsset> sound(new dcp::ReelSoundAsset(first->cpls().front()->reels().front()->main_sound()->asset(), 0));