Fix combining when two DCPs both contain copies of the same asset.

[libdcp.git] / test / read_dcp_test.cc

diff --git a/test/read_dcp_test.cc b/test/read_dcp_test.cc
index 60aa3591ef4ecec2d5984f37c2efffac40986d3c..f995353efd0f59c70ce7688e027be3f5baf6efa8 100644 (file)
--- a/test/read_dcp_test.cc
+++ b/test/read_dcp_test.cc
@@ -1,29 +1,44 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
 
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 #include <boost/test/unit_test.hpp>
 #include <boost/optional/optional_io.hpp>
 #include "dcp.h"
 #include "cpl.h"
+#include "stream_operators.h"
 
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 /** Read a SMPTE DCP that is in git and make sure that basic stuff is read in correctly */
 BOOST_AUTO_TEST_CASE (read_dcp_test1)
@@ -31,13 +46,14 @@ BOOST_AUTO_TEST_CASE (read_dcp_test1)
        dcp::DCP d ("test/ref/DCP/dcp_test1");
        d.read ();
 
-       list<shared_ptr<dcp::CPL> > cpls = d.cpls ();
+       auto cpls = d.cpls ();
        BOOST_CHECK_EQUAL (cpls.size(), 1);
 
-       BOOST_CHECK_EQUAL (cpls.front()->annotation_text(), "A Test DCP");
-       BOOST_CHECK_EQUAL (cpls.front()->content_kind(), dcp::FEATURE);
+       BOOST_REQUIRE (cpls[0]->annotation_text());
+       BOOST_CHECK_EQUAL (cpls[0]->annotation_text().get(), "A Test DCP");
+       BOOST_CHECK_EQUAL (cpls[0]->content_kind(), dcp::ContentKind::TRAILER);
        BOOST_REQUIRE (d.standard());
-       BOOST_CHECK_EQUAL (d.standard(), dcp::SMPTE);
+       BOOST_CHECK_EQUAL (d.standard(), dcp::Standard::SMPTE);
 }
 
 /** Read an Interop DCP that is in git and make sure that basic stuff is read in correctly */
@@ -46,11 +62,12 @@ BOOST_AUTO_TEST_CASE (read_dcp_test2)
        dcp::DCP d ("test/ref/DCP/dcp_test3");
        d.read ();
 
-       list<shared_ptr<dcp::CPL> > cpls = d.cpls ();
+       auto cpls = d.cpls ();
        BOOST_CHECK_EQUAL (cpls.size(), 1);
 
-       BOOST_CHECK_EQUAL (cpls.front()->annotation_text(), "Test_FTR-1_F-119_10_2K_20160524_IOP_OV");
-       BOOST_CHECK_EQUAL (cpls.front()->content_kind(), dcp::FEATURE);
+       BOOST_REQUIRE (cpls[0]->annotation_text());
+       BOOST_CHECK_EQUAL (cpls[0]->annotation_text().get(), "Test_FTR-1_F-119_10_2K_20160524_IOP_OV");
+       BOOST_CHECK_EQUAL (cpls[0]->content_kind(), dcp::ContentKind::FEATURE);
        BOOST_REQUIRE (d.standard());
-       BOOST_CHECK_EQUAL (d.standard(), dcp::INTEROP);
+       BOOST_CHECK_EQUAL (d.standard(), dcp::Standard::INTEROP);
 }