Tidy up some test names and remove pointless comments.

[dcpomatic.git] / test / render_subtitles_test.cc

diff --git a/test/render_subtitles_test.cc b/test/render_subtitles_test.cc
index 508e73972d88d84bf0a6258afd64adf1664133a9..f4ff3b7bb2f05a76bcc76272eb3adeda3bb01590 100644 (file)
--- a/test/render_subtitles_test.cc
+++ b/test/render_subtitles_test.cc
@@ -64,54 +64,50 @@ add (std::list<StringText>& s, std::string text, bool italic, bool bold, bool un
                );
 }
 
-/** Test marked_up() in render_text.cc */
-BOOST_AUTO_TEST_CASE (render_markup_test1)
+
+BOOST_AUTO_TEST_CASE (marked_up_test1)
 {
        std::list<StringText> s;
        add (s, "Hello", false, false, false);
-       BOOST_CHECK_EQUAL(marked_up(s, 1024, 1, ""), "<span size=\"32256\" 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)
+
+BOOST_AUTO_TEST_CASE (marked_up_test2)
 {
        std::list<StringText> s;
        add (s, "Hello", false, true, false);
-       BOOST_CHECK_EQUAL(marked_up(s, 1024, 1, ""), "<span weight=\"bold\" size=\"32256\" 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)
+BOOST_AUTO_TEST_CASE (marked_up_test3)
 {
        std::list<StringText> s;
        add (s, "Hello", true, true, false);
-       BOOST_CHECK_EQUAL(marked_up(s, 1024, 1, ""), "<span style=\"italic\" weight=\"bold\" size=\"32256\" 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)
+BOOST_AUTO_TEST_CASE (marked_up_test4)
 {
        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=\"32256\" 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)
+BOOST_AUTO_TEST_CASE (marked_up_test5)
 {
        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=\"32256\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span><span size=\"32256\" 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)
+BOOST_AUTO_TEST_CASE (marked_up_test6)
 {
        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=\"32256\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span><span size=\"32256\" alpha=\"65535\" color=\"#FFFFFF\"> world </span><span weight=\"bold\" size=\"32256\" 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>");
 }