Remove ReelEncryptableAsset and tidy up a bit.

[libdcp.git] / test / read_smpte_subtitle_test.cc

diff --git a/test/read_smpte_subtitle_test.cc b/test/read_smpte_subtitle_test.cc
index ca08e117fc13d9d5e5d0ac4e1307017847714417..49fd1f6271c25f3f6b28d593a930efb77f13992f 100644 (file)
--- a/test/read_smpte_subtitle_test.cc
+++ b/test/read_smpte_subtitle_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -36,13 +36,14 @@
 #include "local_time.h"
 #include "smpte_load_font_node.h"
 #include "subtitle_image.h"
+#include "stream_operators.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/optional.hpp>
 #include <boost/optional/optional_io.hpp>
 
 using std::list;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 
 /** Check reading of a SMPTE subtitle file */
 BOOST_AUTO_TEST_CASE (read_smpte_subtitle_test)
@@ -66,19 +67,19 @@ BOOST_AUTO_TEST_CASE (read_smpte_subtitle_test)
        BOOST_CHECK_EQUAL (sc.edit_rate(), dcp::Fraction (25, 1));
        BOOST_CHECK_EQUAL (sc.time_code_rate(), 25);
        BOOST_CHECK_EQUAL (sc.start_time(), dcp::Time (0, 0, 0, 0, 25));
-       list<shared_ptr<dcp::LoadFontNode> > lfn = sc.load_font_nodes ();
+       auto lfn = sc.load_font_nodes ();
        BOOST_REQUIRE_EQUAL (lfn.size(), 1);
        shared_ptr<dcp::SMPTELoadFontNode> smpte_lfn = dynamic_pointer_cast<dcp::SMPTELoadFontNode> (lfn.front ());
        BOOST_REQUIRE (smpte_lfn);
        BOOST_CHECK_EQUAL (smpte_lfn->id, "theFontId");
        BOOST_CHECK_EQUAL (smpte_lfn->urn, "9118bbce-4105-4a05-b37c-a5a6f75e1fea");
        BOOST_REQUIRE_EQUAL (sc.subtitles().size(), 63);
-       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(sc.subtitles().front()));
-       BOOST_CHECK_EQUAL (dynamic_pointer_cast<dcp::SubtitleString>(sc.subtitles().front())->text(), "Noch mal.");
+       BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(sc.subtitles().front()));
+       BOOST_CHECK_EQUAL (dynamic_pointer_cast<const dcp::SubtitleString>(sc.subtitles().front())->text(), "Noch mal.");
        BOOST_CHECK_EQUAL (sc.subtitles().front()->in(), dcp::Time (0, 0, 25, 12, 25));
        BOOST_CHECK_EQUAL (sc.subtitles().front()->out(), dcp::Time (0, 0, 26, 4, 25));
-       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(sc.subtitles().back()));
-       BOOST_CHECK_EQUAL (dynamic_pointer_cast<dcp::SubtitleString>(sc.subtitles().back())->text(), "Prochainement");
+       BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(sc.subtitles().back()));
+       BOOST_CHECK_EQUAL (dynamic_pointer_cast<const dcp::SubtitleString>(sc.subtitles().back())->text(), "Prochainement");
        BOOST_CHECK_EQUAL (sc.subtitles().back()->in(), dcp::Time (0, 1, 57, 17, 25));
        BOOST_CHECK_EQUAL (sc.subtitles().back()->out(), dcp::Time (0, 1, 58, 12, 25));
 }
@@ -88,34 +89,35 @@ BOOST_AUTO_TEST_CASE (read_smpte_subtitle_test2)
 {
        dcp::SMPTESubtitleAsset sc (private_test / "olsson.xml");
 
-       BOOST_REQUIRE_EQUAL (sc.subtitles().size(), 6);
-       list<shared_ptr<dcp::Subtitle> >::const_iterator i = sc.subtitles().begin();
-       shared_ptr<dcp::SubtitleString> is = dynamic_pointer_cast<dcp::SubtitleString>(*i);
+       auto subs = sc.subtitles();
+       BOOST_REQUIRE_EQUAL (subs.size(), 6);
+       auto i = 0;
+       auto is = dynamic_pointer_cast<const dcp::SubtitleString>(subs[i]);
        BOOST_REQUIRE (is);
        BOOST_CHECK_EQUAL (is->text(), "Testing is ");
        BOOST_CHECK (!is->italic());
        ++i;
-       is = dynamic_pointer_cast<dcp::SubtitleString>(*i);
+       is = dynamic_pointer_cast<const dcp::SubtitleString>(subs[i]);
        BOOST_REQUIRE (is);
        BOOST_CHECK_EQUAL (is->text(), "really");
        BOOST_CHECK (is->italic());
        ++i;
-       is = dynamic_pointer_cast<dcp::SubtitleString>(*i);
+       is = dynamic_pointer_cast<const dcp::SubtitleString>(subs[i]);
        BOOST_REQUIRE (is);
        BOOST_CHECK_EQUAL (is->text(), " fun!");
        BOOST_CHECK (!is->italic());
        ++i;
-       is = dynamic_pointer_cast<dcp::SubtitleString>(*i);
+       is = dynamic_pointer_cast<const dcp::SubtitleString>(subs[i]);
        BOOST_REQUIRE (is);
        BOOST_CHECK_EQUAL (is->text(), "This is the ");
        BOOST_CHECK (!is->italic());
        ++i;
-       is = dynamic_pointer_cast<dcp::SubtitleString>(*i);
+       is = dynamic_pointer_cast<const dcp::SubtitleString>(subs[i]);
        BOOST_REQUIRE (is);
        BOOST_CHECK_EQUAL (is->text(), "second");
        BOOST_CHECK (is->italic());
        ++i;
-       is = dynamic_pointer_cast<dcp::SubtitleString>(*i);
+       is = dynamic_pointer_cast<const dcp::SubtitleString>(subs[i]);
        BOOST_REQUIRE (is);
        BOOST_CHECK_EQUAL (is->text(), " line!");
        BOOST_CHECK (!is->italic());
@@ -127,7 +129,7 @@ BOOST_AUTO_TEST_CASE (read_smpte_subtitle_test3)
        dcp::SMPTESubtitleAsset subs ("test/data/subs.mxf");
 
        BOOST_REQUIRE_EQUAL (subs.subtitles().size(), 1);
-       shared_ptr<dcp::SubtitleImage> si = dynamic_pointer_cast<dcp::SubtitleImage>(subs.subtitles().front());
+       auto si = dynamic_pointer_cast<const dcp::SubtitleImage>(subs.subtitles()[0]);
        BOOST_REQUIRE (si);
-       BOOST_CHECK (si->png_image() == dcp::Data("test/data/sub.png"));
+       BOOST_CHECK (si->png_image() == dcp::ArrayData("test/data/sub.png"));
 }