Fixes for the bad distros.

[libdcp.git] / test / dcp_test.cc

diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index bbc6ff832607fa11b0f2530525b13ca0ac2daa3d..513f6833aa8e643b2c9fbcde76aabcec332c3fe1 100644 (file)
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2017 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -40,13 +40,14 @@
 using std::string;
 using boost::shared_ptr;
 
-/** Test creation of a 2D DCP from very simple inputs */
-BOOST_AUTO_TEST_CASE (dcp_test1)
+static shared_ptr<dcp::DCP>
+make_simple (boost::filesystem::path path)
 {
        Kumu::cth_test = true;
 
        /* Some known metadata */
        dcp::XMLMetadata xml_meta;
+       xml_meta.annotation_text = "A Test DCP";
        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";
@@ -56,9 +57,9 @@ BOOST_AUTO_TEST_CASE (dcp_test1)
        mxf_meta.product_version = "0.0.25";
 
        /* We're making build/test/DCP/dcp_test1 */
-       boost::filesystem::remove_all ("build/test/DCP/dcp_test1");
-       boost::filesystem::create_directories ("build/test/DCP/dcp_test1");
-       dcp::DCP d ("build/test/DCP/dcp_test1");
+       boost::filesystem::remove_all (path);
+       boost::filesystem::create_directories (path);
+       shared_ptr<dcp::DCP> d (new dcp::DCP (path));
        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");
@@ -66,7 +67,7 @@ BOOST_AUTO_TEST_CASE (dcp_test1)
 
        shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1)));
        mp->set_metadata (mxf_meta);
-       shared_ptr<dcp::PictureAssetWriter> picture_writer = mp->start_write ("build/test/DCP/dcp_test1/video.mxf", dcp::SMPTE, false);
+       shared_ptr<dcp::PictureAssetWriter> picture_writer = mp->start_write (path / "video.mxf", dcp::SMPTE, false);
        dcp::File j2c ("test/data/32x32_red_square.j2c");
        for (int i = 0; i < 24; ++i) {
                picture_writer->write (j2c.data (), j2c.size ());
@@ -75,7 +76,7 @@ BOOST_AUTO_TEST_CASE (dcp_test1)
 
        shared_ptr<dcp::SoundAsset> ms (new dcp::SoundAsset (dcp::Fraction (24, 1), 48000, 1));
        ms->set_metadata (mxf_meta);
-       shared_ptr<dcp::SoundAssetWriter> sound_writer = ms->start_write ("build/test/DCP/dcp_test1/audio.mxf", dcp::SMPTE, dcp::CHANNEL_ASSIGNMENT_51);
+       shared_ptr<dcp::SoundAssetWriter> sound_writer = ms->start_write (path / "audio.mxf", dcp::SMPTE);
 
        SF_INFO info;
        info.format = 0;
@@ -101,10 +102,19 @@ BOOST_AUTO_TEST_CASE (dcp_test1)
                                  )
                          ));
 
-       d.add (cpl);
-
-       d.write_xml (dcp::SMPTE, xml_meta);
+       d->add (cpl);
+       return d;
+}
 
+/** Test creation of a 2D SMPTE DCP from very simple inputs */
+BOOST_AUTO_TEST_CASE (dcp_test1)
+{
+       dcp::XMLMetadata xml_meta;
+       xml_meta.annotation_text = "Created by libdcp";
+       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);
        /* build/test/DCP/dcp_test1 is checked against test/ref/DCP/dcp_test1 by run/tests */
 }
 
@@ -115,6 +125,7 @@ BOOST_AUTO_TEST_CASE (dcp_test2)
 
        /* Some known metadata */
        dcp::XMLMetadata xml_meta;
+       xml_meta.annotation_text = "A Test DCP";
        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";
@@ -146,7 +157,7 @@ BOOST_AUTO_TEST_CASE (dcp_test2)
 
        shared_ptr<dcp::SoundAsset> ms (new dcp::SoundAsset (dcp::Fraction (24, 1), 48000, 1));
        ms->set_metadata (mxf_meta);
-       shared_ptr<dcp::SoundAssetWriter> sound_writer = ms->start_write ("build/test/DCP/dcp_test2/audio.mxf", dcp::SMPTE, dcp::CHANNEL_ASSIGNMENT_51);
+       shared_ptr<dcp::SoundAssetWriter> sound_writer = ms->start_write ("build/test/DCP/dcp_test2/audio.mxf", dcp::SMPTE);
 
        SF_INFO info;
        info.format = 0;
@@ -174,6 +185,7 @@ BOOST_AUTO_TEST_CASE (dcp_test2)
 
        d.add (cpl);
 
+       xml_meta.annotation_text = "Created by libdcp";
        d.write_xml (dcp::SMPTE, xml_meta);
 
        /* build/test/DCP/dcp_test2 is checked against test/ref/DCP/dcp_test2 by run/tests */
@@ -214,6 +226,7 @@ BOOST_AUTO_TEST_CASE (dcp_test5)
 
        /* Some known metadata */
        dcp::XMLMetadata xml_meta;
+       xml_meta.annotation_text = "A Test DCP";
        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";
@@ -242,7 +255,7 @@ BOOST_AUTO_TEST_CASE (dcp_test5)
 
        shared_ptr<dcp::SoundAsset> ms (new dcp::SoundAsset (dcp::Fraction (24, 1), 48000, 1));
        ms->set_metadata (mxf_meta);
-       shared_ptr<dcp::SoundAssetWriter> sound_writer = ms->start_write ("build/test/DCP/dcp_test5/audio.mxf", dcp::SMPTE, dcp::CHANNEL_ASSIGNMENT_51);
+       shared_ptr<dcp::SoundAssetWriter> sound_writer = ms->start_write ("build/test/DCP/dcp_test5/audio.mxf", dcp::SMPTE);
 
        SF_INFO info;
        info.format = 0;
@@ -274,7 +287,34 @@ BOOST_AUTO_TEST_CASE (dcp_test5)
 
        d.add (cpl);
 
+       xml_meta.annotation_text = "Created by libdcp";
        d.write_xml (dcp::SMPTE, xml_meta);
 
        /* build/test/DCP/dcp_test5 is checked against test/ref/DCP/dcp_test5 by run/tests */
 }
+
+/** Basic tests of reading a 2D DCP with an Atmos track */
+BOOST_AUTO_TEST_CASE (dcp_test6)
+{
+       dcp::DCP dcp ("test/ref/DCP/dcp_test5");
+       dcp.read ();
+
+       BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1);
+       BOOST_REQUIRE_EQUAL (dcp.cpls().front()->reels().size(), 1);
+       BOOST_CHECK (dcp.cpls().front()->reels().front()->main_picture());
+       BOOST_CHECK (dcp.cpls().front()->reels().front()->main_sound());
+       BOOST_CHECK (!dcp.cpls().front()->reels().front()->main_subtitle());
+       BOOST_CHECK (dcp.cpls().front()->reels().front()->atmos());
+}
+
+/** Test creation of a 2D Interop DCP from very simple inputs */
+BOOST_AUTO_TEST_CASE (dcp_test7)
+{
+       dcp::XMLMetadata xml_meta;
+       xml_meta.annotation_text = "Created by libdcp";
+       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);
+       /* build/test/DCP/dcp_test7 is checked against test/ref/DCP/dcp_test7 by run/tests */
+}