X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Frender_subtitles_test.cc;h=5774c8e9af7e111dc4d5140eb68c39fc33627b2f;hb=94ab538738526948c5a52ed1222be1e484255541;hp=9ab4f5debd8bb7084ae6ee3de751886cc6825b9c;hpb=59f07d959514b80fcce5aa99f575ef8e6fceba8b;p=dcpomatic.git

diff --git a/test/render_subtitles_test.cc b/test/render_subtitles_test.cc
index 9ab4f5deb..5774c8e9a 100644
--- a/test/render_subtitles_test.cc
+++ b/test/render_subtitles_test.cc
@@ -18,86 +18,95 @@
 
 */
 
-#include "lib/render_subtitles.h"
+/** @file  test/render_text_test.cc
+ *  @brief Check markup of subtitles for rendering.
+ *  @ingroup feature
+ */
+
+#include "lib/render_text.h"
 #include <dcp/subtitle_string.h>
 #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<StringText>& 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 ()
+		StringText (
+			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::Effect::NONE,
+				dcp::Colour (0, 0, 0),
+				dcp::Time (),
+				dcp::Time (),
+				0
+				),
+			2
 			)
 		);
 }
 
-/** Test marked_up() in render_subtitles.cc */
+/** Test marked_up() in render_text.cc */
 BOOST_AUTO_TEST_CASE (render_markup_test1)
 {
-	std::list<dcp::SubtitleString> s;
+	std::list<StringText> s;
 	add (s, "Hello", false, false, false);
-	BOOST_CHECK_EQUAL (marked_up (s), "Hello");
+	BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "<span size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
 }
 
-/** Test marked_up() in render_subtitles.cc */
+/** Test marked_up() in render_text.cc */
 BOOST_AUTO_TEST_CASE (render_markup_test2)
 {
-	std::list<dcp::SubtitleString> s;
+	std::list<StringText> s;
 	add (s, "Hello", false, true, false);
-	BOOST_CHECK_EQUAL (marked_up (s), "<b>Hello</b>");
+	BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "<span weight=\"bold\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
 }
 
 
-/** Test marked_up() in render_subtitles.cc */
+/** Test marked_up() in render_text.cc */
 BOOST_AUTO_TEST_CASE (render_markup_test3)
 {
-	std::list<dcp::SubtitleString> s;
+	std::list<StringText> s;
 	add (s, "Hello", true, true, false);
-	BOOST_CHECK_EQUAL (marked_up (s), "<i><b>Hello</b></i>");
+	BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "<span style=\"italic\" weight=\"bold\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
 }
 
-/** Test marked_up() in render_subtitles.cc */
+/** Test marked_up() in render_text.cc */
 BOOST_AUTO_TEST_CASE (render_markup_test4)
 {
-	std::list<dcp::SubtitleString> s;
+	std::list<StringText> s;
 	add (s, "Hello", true, true, true);
-	BOOST_CHECK_EQUAL (marked_up (s), "<i><b><u>Hello</u></b></i>");
+	BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "<span style=\"italic\" weight=\"bold\" underline=\"single\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
 }
 
-/** Test marked_up() in render_subtitles.cc */
+/** Test marked_up() in render_text.cc */
 BOOST_AUTO_TEST_CASE (render_markup_test5)
 {
-	std::list<dcp::SubtitleString> s;
+	std::list<StringText> s;
 	add (s, "Hello", false, true, false);
 	add (s, " world.", false, false, false);
-	BOOST_CHECK_EQUAL (marked_up (s), "<b>Hello</b> world.");
+	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>");
 }
 
-/** Test marked_up() in render_subtitles.cc */
+/** Test marked_up() in render_text.cc */
 BOOST_AUTO_TEST_CASE (render_markup_test6)
 {
-	std::list<dcp::SubtitleString> 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), "<i>Hello</i> world <b>we are bold.</b>");
+	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>");
 }