libdcp API change ReelMXF -> ReelFileAsset.

[dcpomatic.git] / test / render_subtitles_test.cc

diff --git a/test/render_subtitles_test.cc b/test/render_subtitles_test.cc
index 5b3136497df7d1e02942840db3cb9c41b19818bf..a81ef05bf96c3a3c607c82151abf1113bc8ac84d 100644 (file)
--- a/test/render_subtitles_test.cc
+++ b/test/render_subtitles_test.cc
@@ -20,7 +20,7 @@
 
 /** @file  test/render_text_test.cc
  *  @brief Check markup of subtitles for rendering.
- *  @ingroup specific
+ *  @ingroup feature
  */
 
 #include "lib/render_text.h"
@@ -28,10 +28,10 @@
 #include <boost/test/unit_test.hpp>
 
 static void
-add (std::list<TextCaption>& s, std::string text, bool italic, bool bold, bool underline)
+add (std::list<StringText>& s, std::string text, bool italic, bool bold, bool underline)
 {
        s.push_back (
-               TextCaption (
+               StringText (
                        dcp::SubtitleString (
                                boost::optional<std::string> (),
                                italic,
@@ -43,16 +43,17 @@ add (std::list<TextCaption>& s, std::string text, bool italic, bool bold, bool u
                                dcp::Time (),
                                dcp::Time (),
                                1,
-                               dcp::HALIGN_LEFT,
+                               dcp::HAlign::LEFT,
                                1,
-                               dcp::VALIGN_TOP,
-                               dcp::DIRECTION_LTR,
+                               dcp::VAlign::TOP,
+                               dcp::Direction::LTR,
                                text,
-                               dcp::NONE,
+                               dcp::Effect::NONE,
                                dcp::Colour (0, 0, 0),
                                dcp::Time (),
                                dcp::Time ()
-                               )
+                               ),
+                       2
                        )
                );
 }
@@ -60,7 +61,7 @@ add (std::list<TextCaption>& s, std::string text, bool italic, bool bold, bool u
 /** Test marked_up() in render_text.cc */
 BOOST_AUTO_TEST_CASE (render_markup_test1)
 {
-       std::list<TextCaption> s;
+       std::list<StringText> s;
        add (s, "Hello", false, false, false);
        BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "<span size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
 }
@@ -68,7 +69,7 @@ BOOST_AUTO_TEST_CASE (render_markup_test1)
 /** Test marked_up() in render_text.cc */
 BOOST_AUTO_TEST_CASE (render_markup_test2)
 {
-       std::list<TextCaption> s;
+       std::list<StringText> s;
        add (s, "Hello", false, true, false);
        BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "<span weight=\"bold\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
 }
@@ -77,7 +78,7 @@ BOOST_AUTO_TEST_CASE (render_markup_test2)
 /** Test marked_up() in render_text.cc */
 BOOST_AUTO_TEST_CASE (render_markup_test3)
 {
-       std::list<TextCaption> s;
+       std::list<StringText> s;
        add (s, "Hello", true, true, false);
        BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "<span style=\"italic\" weight=\"bold\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
 }
@@ -85,7 +86,7 @@ BOOST_AUTO_TEST_CASE (render_markup_test3)
 /** Test marked_up() in render_text.cc */
 BOOST_AUTO_TEST_CASE (render_markup_test4)
 {
-       std::list<TextCaption> s;
+       std::list<StringText> s;
        add (s, "Hello", true, true, true);
        BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "<span style=\"italic\" weight=\"bold\" underline=\"single\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
 }
@@ -93,7 +94,7 @@ BOOST_AUTO_TEST_CASE (render_markup_test4)
 /** Test marked_up() in render_text.cc */
 BOOST_AUTO_TEST_CASE (render_markup_test5)
 {
-       std::list<TextCaption> s;
+       std::list<StringText> s;
        add (s, "Hello", false, true, false);
        add (s, " world.", false, false, false);
        BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "<span weight=\"bold\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span><span size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\"> world.</span>");
@@ -102,7 +103,7 @@ BOOST_AUTO_TEST_CASE (render_markup_test5)
 /** Test marked_up() in render_text.cc */
 BOOST_AUTO_TEST_CASE (render_markup_test6)
 {
-       std::list<TextCaption> s;
+       std::list<StringText> s;
        add (s, "Hello", true, false, false);
        add (s, " world ", false, false, false);
        add (s, "we are bold.", false, true, false);