X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Frender_subtitles_test.cc;h=0110752a1211028a923f2009559975331f90fd5e;hp=a8db80c8b30bdc45c78e335f204afde56e1fe83b;hb=8dc70c1dab97a336fdb82da75f368ea0a8e679e3;hpb=0e4a58abdc78f84478031acdc0acb95f5cb9a2a6

diff --git a/test/render_subtitles_test.cc b/test/render_subtitles_test.cc
index a8db80c8b..0110752a1 100644
--- a/test/render_subtitles_test.cc
+++ b/test/render_subtitles_test.cc
@@ -18,20 +18,24 @@
 
 */
 
+
 /** @file  test/render_text_test.cc
  *  @brief Check markup of subtitles for rendering.
- *  @ingroup specific
+ *  @ingroup feature
  */
 
+
 #include "lib/render_text.h"
+#include "lib/string_text.h"
 #include <dcp/subtitle_string.h>
 #include <boost/test/unit_test.hpp>
 
+
 static void
-add (std::list<PlainText>& 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 (
-		PlainText (
+		StringText (
 			dcp::SubtitleString (
 				boost::optional<std::string> (),
 				italic,
@@ -43,16 +47,19 @@ add (std::list<PlainText>& s, std::string text, bool italic, bool bold, bool und
 				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,
+			std::shared_ptr<dcpomatic::Font>()
 			)
 		);
 }
@@ -60,51 +67,51 @@ add (std::list<PlainText>& s, std::string text, bool italic, bool bold, bool und
 /** Test marked_up() in render_text.cc */
 BOOST_AUTO_TEST_CASE (render_markup_test1)
 {
-	std::list<PlainText> 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>");
+	BOOST_CHECK_EQUAL(marked_up(s, 1024, 1, ""), "<span size=\"41705\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
 }
 
 /** Test marked_up() in render_text.cc */
 BOOST_AUTO_TEST_CASE (render_markup_test2)
 {
-	std::list<PlainText> 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>");
+	BOOST_CHECK_EQUAL(marked_up(s, 1024, 1, ""), "<span weight=\"bold\" size=\"41705\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
 }
 
 
 /** Test marked_up() in render_text.cc */
 BOOST_AUTO_TEST_CASE (render_markup_test3)
 {
-	std::list<PlainText> 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>");
+	BOOST_CHECK_EQUAL(marked_up(s, 1024, 1, ""), "<span style=\"italic\" weight=\"bold\" size=\"41705\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
 }
 
 /** Test marked_up() in render_text.cc */
 BOOST_AUTO_TEST_CASE (render_markup_test4)
 {
-	std::list<PlainText> 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>");
+	BOOST_CHECK_EQUAL(marked_up(s, 1024, 1, ""), "<span style=\"italic\" weight=\"bold\" underline=\"single\" size=\"41705\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
 }
 
 /** Test marked_up() in render_text.cc */
 BOOST_AUTO_TEST_CASE (render_markup_test5)
 {
-	std::list<PlainText> 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>");
+	BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "<span weight=\"bold\" size=\"41705\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span><span size=\"41705\" alpha=\"65535\" color=\"#FFFFFF\"> world.</span>");
 }
 
 /** Test marked_up() in render_text.cc */
 BOOST_AUTO_TEST_CASE (render_markup_test6)
 {
-	std::list<PlainText> 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);
-	BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "<span style=\"italic\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span><span size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\"> world </span><span weight=\"bold\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">we are bold.</span>");
+	BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "<span style=\"italic\" size=\"41705\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span><span size=\"41705\" alpha=\"65535\" color=\"#FFFFFF\"> world </span><span weight=\"bold\" size=\"41705\" alpha=\"65535\" color=\"#FFFFFF\">we are bold.</span>");
 }