Rename debug type THREED to THREED_D.

[dcpomatic.git] / test / closed_caption_test.cc

diff --git a/test/closed_caption_test.cc b/test/closed_caption_test.cc
index 283ce6b9370a1c2774f633e01e908da996f9a201..48fc8e05c91a1a52893ade569dc9477d65bae3a2 100644 (file)
--- a/test/closed_caption_test.cc
+++ b/test/closed_caption_test.cc
@@ -29,7 +29,7 @@
 #include <boost/test/unit_test.hpp>
 
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 /** Basic test that Interop closed captions are written */
 BOOST_AUTO_TEST_CASE (closed_caption_test1)
@@ -69,11 +69,11 @@ BOOST_AUTO_TEST_CASE (closed_caption_test2)
        BOOST_REQUIRE (!wait_for_jobs ());
 
        content1->only_text()->set_type (TEXT_CLOSED_CAPTION);
-       content1->only_text()->set_dcp_track (DCPTextTrack("First track", "French"));
+       content1->only_text()->set_dcp_track (DCPTextTrack("First track", "fr-FR"));
        content2->only_text()->set_type (TEXT_CLOSED_CAPTION);
-       content2->only_text()->set_dcp_track (DCPTextTrack("Second track", "German"));
+       content2->only_text()->set_dcp_track (DCPTextTrack("Second track", "de-DE"));
        content3->only_text()->set_type (TEXT_CLOSED_CAPTION);
-       content3->only_text()->set_dcp_track (DCPTextTrack("Third track", "Italian"));
+       content3->only_text()->set_dcp_track (DCPTextTrack("Third track", "it-IT"));
 
        film->make_dcp ();
        BOOST_REQUIRE (!wait_for_jobs ());
@@ -83,19 +83,19 @@ BOOST_AUTO_TEST_CASE (closed_caption_test2)
 
        BOOST_REQUIRE_EQUAL (check.cpls().size(), 1U);
        BOOST_REQUIRE_EQUAL (check.cpls().front()->reels().size(), 1U);
-       list<shared_ptr<dcp::ReelClosedCaptionAsset> > ccaps = check.cpls().front()->reels().front()->closed_captions();
+       auto ccaps = check.cpls().front()->reels().front()->closed_captions();
        BOOST_REQUIRE_EQUAL (ccaps.size(), 3U);
 
-       list<shared_ptr<dcp::ReelClosedCaptionAsset> >::const_iterator i = ccaps.begin ();
+       auto i = ccaps.begin ();
        BOOST_CHECK_EQUAL ((*i)->annotation_text(), "First track");
        BOOST_REQUIRE (static_cast<bool>((*i)->language()));
-       BOOST_CHECK_EQUAL ((*i)->language().get(), "French");
+       BOOST_CHECK_EQUAL ((*i)->language().get(), "fr-FR");
        ++i;
        BOOST_CHECK_EQUAL ((*i)->annotation_text(), "Second track");
        BOOST_REQUIRE (static_cast<bool>((*i)->language()));
-       BOOST_CHECK_EQUAL ((*i)->language().get(), "German");
+       BOOST_CHECK_EQUAL ((*i)->language().get(), "de-DE");
        ++i;
        BOOST_CHECK_EQUAL ((*i)->annotation_text(), "Third track");
        BOOST_REQUIRE (static_cast<bool>((*i)->language()));
-       BOOST_CHECK_EQUAL ((*i)->language().get(), "Italian");
+       BOOST_CHECK_EQUAL ((*i)->language().get(), "it-IT");
 }