diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-08-25 14:43:09 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-08-25 14:43:09 +0100 |
| commit | b42066b7d664ac322e6d2c79c5b0fa8bb0eb75c9 (patch) | |
| tree | f0fd3b7f4bb85e81f0be6a84be3dce54e63df109 /test | |
| parent | bb7917d2ea06e6eaa566b00a279e9b5a6a351fc9 (diff) | |
| parent | 175ec3510439b2184026ee7e8dc75668448f4e21 (diff) | |
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Diffstat (limited to 'test')
| -rw-r--r-- | test/render_subtitles_test.cc | 56 |
1 files changed, 29 insertions, 27 deletions
diff --git a/test/render_subtitles_test.cc b/test/render_subtitles_test.cc index 9ab4f5deb..91aafb072 100644 --- a/test/render_subtitles_test.cc +++ b/test/render_subtitles_test.cc @@ -23,29 +23,31 @@ #include <boost/test/unit_test.hpp> static void -add (std::list<dcp::SubtitleString>& s, std::string text, bool italic, bool bold, bool underline) +add (std::list<SubtitleString>& s, std::string text, bool italic, bool bold, bool underline) { s.push_back ( - dcp::SubtitleString ( - boost::optional<std::string> (), - italic, - bold, - underline, - dcp::Colour (255, 255, 255), - 42, - 1, - dcp::Time (), - dcp::Time (), - 1, - dcp::HALIGN_LEFT, - 1, - dcp::VALIGN_TOP, - dcp::DIRECTION_LTR, - text, - dcp::NONE, - dcp::Colour (0, 0, 0), - dcp::Time (), - dcp::Time () + SubtitleString ( + dcp::SubtitleString ( + boost::optional<std::string> (), + italic, + bold, + underline, + dcp::Colour (255, 255, 255), + 42, + 1, + dcp::Time (), + dcp::Time (), + 1, + dcp::HALIGN_LEFT, + 1, + dcp::VALIGN_TOP, + dcp::DIRECTION_LTR, + text, + dcp::NONE, + dcp::Colour (0, 0, 0), + dcp::Time (), + dcp::Time () + ) ) ); } @@ -53,7 +55,7 @@ add (std::list<dcp::SubtitleString>& s, std::string text, bool italic, bool bold /** Test marked_up() in render_subtitles.cc */ BOOST_AUTO_TEST_CASE (render_markup_test1) { - std::list<dcp::SubtitleString> s; + std::list<SubtitleString> s; add (s, "Hello", false, false, false); BOOST_CHECK_EQUAL (marked_up (s), "Hello"); } @@ -61,7 +63,7 @@ BOOST_AUTO_TEST_CASE (render_markup_test1) /** Test marked_up() in render_subtitles.cc */ BOOST_AUTO_TEST_CASE (render_markup_test2) { - std::list<dcp::SubtitleString> s; + std::list<SubtitleString> s; add (s, "Hello", false, true, false); BOOST_CHECK_EQUAL (marked_up (s), "<b>Hello</b>"); } @@ -70,7 +72,7 @@ BOOST_AUTO_TEST_CASE (render_markup_test2) /** Test marked_up() in render_subtitles.cc */ BOOST_AUTO_TEST_CASE (render_markup_test3) { - std::list<dcp::SubtitleString> s; + std::list<SubtitleString> s; add (s, "Hello", true, true, false); BOOST_CHECK_EQUAL (marked_up (s), "<i><b>Hello</b></i>"); } @@ -78,7 +80,7 @@ BOOST_AUTO_TEST_CASE (render_markup_test3) /** Test marked_up() in render_subtitles.cc */ BOOST_AUTO_TEST_CASE (render_markup_test4) { - std::list<dcp::SubtitleString> s; + std::list<SubtitleString> s; add (s, "Hello", true, true, true); BOOST_CHECK_EQUAL (marked_up (s), "<i><b><u>Hello</u></b></i>"); } @@ -86,7 +88,7 @@ BOOST_AUTO_TEST_CASE (render_markup_test4) /** Test marked_up() in render_subtitles.cc */ BOOST_AUTO_TEST_CASE (render_markup_test5) { - std::list<dcp::SubtitleString> s; + std::list<SubtitleString> s; add (s, "Hello", false, true, false); add (s, " world.", false, false, false); BOOST_CHECK_EQUAL (marked_up (s), "<b>Hello</b> world."); @@ -95,7 +97,7 @@ BOOST_AUTO_TEST_CASE (render_markup_test5) /** Test marked_up() in render_subtitles.cc */ BOOST_AUTO_TEST_CASE (render_markup_test6) { - std::list<dcp::SubtitleString> s; + std::list<SubtitleString> s; add (s, "Hello", true, false, false); add (s, " world ", false, false, false); add (s, "we are bold.", false, true, false); |