Add include_mca_subdescriptors flag to SoundAsset writer.

[libdcp.git] / test / read_dcp_test.cc

diff --git a/test/read_dcp_test.cc b/test/read_dcp_test.cc
index 7eed18d0aa82c159218f7101d69c842259b9402d..d014bb8e5e71fa9c64a286d30b8807dbd83fe617 100644 (file)
--- a/test/read_dcp_test.cc
+++ b/test/read_dcp_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -35,6 +35,7 @@
 #include <boost/optional/optional_io.hpp>
 #include "dcp.h"
 #include "cpl.h"
+#include "stream_operators.h"
 
 using std::list;
 using std::shared_ptr;
@@ -46,12 +47,13 @@ BOOST_AUTO_TEST_CASE (read_dcp_test1)
        d.read ();
 
        auto cpls = d.cpls ();
-       BOOST_CHECK_EQUAL (cpls.size(), 1);
+       BOOST_CHECK_EQUAL (cpls.size(), 1U);
 
-       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 */
@@ -61,10 +63,11 @@ BOOST_AUTO_TEST_CASE (read_dcp_test2)
        d.read ();
 
        auto cpls = d.cpls ();
-       BOOST_CHECK_EQUAL (cpls.size(), 1);
+       BOOST_CHECK_EQUAL (cpls.size(), 1U);
 
-       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);
 }