X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Frender_subtitles_test.cc;h=29c6c9963575b949c29bcbe8012aa4ff8c1f0e54;hb=d5ba7d135293103dba55196a3d9a9342795d6188;hp=4276a2b01e58ae155a595a5f223bcb3303484001;hpb=67a68bd971ebe1b35daa3f75873b4ccb53c00ba0;p=dcpomatic.git

diff --git a/test/render_subtitles_test.cc b/test/render_subtitles_test.cc
index 4276a2b01..29c6c9963 100644
--- a/test/render_subtitles_test.cc
+++ b/test/render_subtitles_test.cc
@@ -18,20 +18,20 @@
 
 */
 
-/** @file  test/render_subtitles_test.cc
+/** @file  test/render_text_test.cc
  *  @brief Check markup of subtitles for rendering.
  *  @ingroup specific
  */
 
-#include "lib/render_subtitles.h"
+#include "lib/render_text.h"
 #include <dcp/subtitle_string.h>
 #include <boost/test/unit_test.hpp>
 
 static void
-add (std::list<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 (
-		SubtitleString (
+		StringText (
 			dcp::SubtitleString (
 				boost::optional<std::string> (),
 				italic,
@@ -52,57 +52,58 @@ add (std::list<SubtitleString>& s, std::string text, bool italic, bool bold, boo
 				dcp::Colour (0, 0, 0),
 				dcp::Time (),
 				dcp::Time ()
-				)
+				),
+			2
 			)
 		);
 }
 
-/** Test marked_up() in render_subtitles.cc */
+/** Test marked_up() in render_text.cc */
 BOOST_AUTO_TEST_CASE (render_markup_test1)
 {
-	std::list<SubtitleString> 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>");
 }
 
-/** Test marked_up() in render_subtitles.cc */
+/** Test marked_up() in render_text.cc */
 BOOST_AUTO_TEST_CASE (render_markup_test2)
 {
-	std::list<SubtitleString> 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>");
 }
 
 
-/** Test marked_up() in render_subtitles.cc */
+/** Test marked_up() in render_text.cc */
 BOOST_AUTO_TEST_CASE (render_markup_test3)
 {
-	std::list<SubtitleString> 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>");
 }
 
-/** Test marked_up() in render_subtitles.cc */
+/** Test marked_up() in render_text.cc */
 BOOST_AUTO_TEST_CASE (render_markup_test4)
 {
-	std::list<SubtitleString> 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>");
 }
 
-/** Test marked_up() in render_subtitles.cc */
+/** Test marked_up() in render_text.cc */
 BOOST_AUTO_TEST_CASE (render_markup_test5)
 {
-	std::list<SubtitleString> 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>");
 }
 
-/** Test marked_up() in render_subtitles.cc */
+/** Test marked_up() in render_text.cc */
 BOOST_AUTO_TEST_CASE (render_markup_test6)
 {
-	std::list<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);