X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Frender_subtitles_test.cc;h=5774c8e9af7e111dc4d5140eb68c39fc33627b2f;hb=d2929a5dea6639f1896fb69929a4913e3d4f4fb5;hp=99e1e7a1b11d531210aeb9b22e0536e3e73d61ff;hpb=8611fc8597605aa51373adb4fc8f0c697b8c7360;p=dcpomatic.git diff --git a/test/render_subtitles_test.cc b/test/render_subtitles_test.cc index 99e1e7a1b..5774c8e9a 100644 --- a/test/render_subtitles_test.cc +++ b/test/render_subtitles_test.cc @@ -43,15 +43,16 @@ add (std::list& s, std::string text, bool italic, bool bold, bool un 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 () + dcp::Time (), + 0 ), 2 ) @@ -63,7 +64,7 @@ BOOST_AUTO_TEST_CASE (render_markup_test1) { std::list s; add (s, "Hello", false, false, false); - BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "Hello"); + BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "Hello"); } /** Test marked_up() in render_text.cc */ @@ -71,7 +72,7 @@ BOOST_AUTO_TEST_CASE (render_markup_test2) { std::list s; add (s, "Hello", false, true, false); - BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "Hello"); + BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "Hello"); } @@ -80,7 +81,7 @@ BOOST_AUTO_TEST_CASE (render_markup_test3) { std::list s; add (s, "Hello", true, true, false); - BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "Hello"); + BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "Hello"); } /** Test marked_up() in render_text.cc */ @@ -88,7 +89,7 @@ BOOST_AUTO_TEST_CASE (render_markup_test4) { std::list s; add (s, "Hello", true, true, true); - BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "Hello"); + BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "Hello"); } /** Test marked_up() in render_text.cc */ @@ -97,7 +98,7 @@ BOOST_AUTO_TEST_CASE (render_markup_test5) std::list s; add (s, "Hello", false, true, false); add (s, " world.", false, false, false); - BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "Hello world."); + BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "Hello world."); } /** Test marked_up() in render_text.cc */ @@ -107,5 +108,5 @@ BOOST_AUTO_TEST_CASE (render_markup_test6) add (s, "Hello", true, false, false); add (s, " world ", false, false, false); add (s, "we are bold.", false, true, false); - BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "Hello world we are bold."); + BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "Hello world we are bold."); }