projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Missing override.
[dcpomatic.git]
/
test
/
render_subtitles_test.cc
diff --git
a/test/render_subtitles_test.cc
b/test/render_subtitles_test.cc
index a8db80c8b30bdc45c78e335f204afde56e1fe83b..5774c8e9af7e111dc4d5140eb68c39fc33627b2f 100644
(file)
--- a/
test/render_subtitles_test.cc
+++ b/
test/render_subtitles_test.cc
@@
-20,7
+20,7
@@
/** @file test/render_text_test.cc
* @brief Check markup of subtitles for rendering.
/** @file test/render_text_test.cc
* @brief Check markup of subtitles for rendering.
- * @ingroup
specific
+ * @ingroup
feature
*/
#include "lib/render_text.h"
*/
#include "lib/render_text.h"
@@
-28,10
+28,10
@@
#include <boost/test/unit_test.hpp>
static void
#include <boost/test/unit_test.hpp>
static void
-add (std::list<
Plain
Text>& s, std::string text, bool italic, bool bold, bool underline)
+add (std::list<
String
Text>& s, std::string text, bool italic, bool bold, bool underline)
{
s.push_back (
{
s.push_back (
-
Plain
Text (
+
String
Text (
dcp::SubtitleString (
boost::optional<std::string> (),
italic,
dcp::SubtitleString (
boost::optional<std::string> (),
italic,
@@
-43,16
+43,18
@@
add (std::list<PlainText>& s, std::string text, bool italic, bool bold, bool und
dcp::Time (),
dcp::Time (),
1,
dcp::Time (),
dcp::Time (),
1,
- dcp::HA
LIGN_
LEFT,
+ dcp::HA
lign::
LEFT,
1,
1,
- dcp::VA
LIGN_
TOP,
- dcp::D
IRECTION_
LTR,
+ dcp::VA
lign::
TOP,
+ dcp::D
irection::
LTR,
text,
text,
- dcp::NONE,
+ dcp::
Effect::
NONE,
dcp::Colour (0, 0, 0),
dcp::Time (),
dcp::Colour (0, 0, 0),
dcp::Time (),
- dcp::Time ()
- )
+ dcp::Time (),
+ 0
+ ),
+ 2
)
);
}
)
);
}
@@
-60,51
+62,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)
{
/** Test marked_up() in render_text.cc */
BOOST_AUTO_TEST_CASE (render_markup_test1)
{
- std::list<
Plain
Text> s;
+ std::list<
String
Text> s;
add (s, "Hello", false, false, false);
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=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
}
/** Test marked_up() in render_text.cc */
BOOST_AUTO_TEST_CASE (render_markup_test2)
{
}
/** Test marked_up() in render_text.cc */
BOOST_AUTO_TEST_CASE (render_markup_test2)
{
- std::list<
Plain
Text> s;
+ std::list<
String
Text> s;
add (s, "Hello", false, true, false);
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=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
}
/** Test marked_up() in render_text.cc */
BOOST_AUTO_TEST_CASE (render_markup_test3)
{
}
/** Test marked_up() in render_text.cc */
BOOST_AUTO_TEST_CASE (render_markup_test3)
{
- std::list<
Plain
Text> s;
+ std::list<
String
Text> s;
add (s, "Hello", true, true, false);
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=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
}
/** Test marked_up() in render_text.cc */
BOOST_AUTO_TEST_CASE (render_markup_test4)
{
}
/** Test marked_up() in render_text.cc */
BOOST_AUTO_TEST_CASE (render_markup_test4)
{
- std::list<
Plain
Text> s;
+ std::list<
String
Text> s;
add (s, "Hello", true, true, true);
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=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
}
/** Test marked_up() in render_text.cc */
BOOST_AUTO_TEST_CASE (render_markup_test5)
{
}
/** Test marked_up() in render_text.cc */
BOOST_AUTO_TEST_CASE (render_markup_test5)
{
- std::list<
Plain
Text> s;
+ std::list<
String
Text> s;
add (s, "Hello", false, true, false);
add (s, " world.", false, false, false);
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=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span><span size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\"> world.</span>");
}
/** Test marked_up() in render_text.cc */
BOOST_AUTO_TEST_CASE (render_markup_test6)
{
}
/** Test marked_up() in render_text.cc */
BOOST_AUTO_TEST_CASE (render_markup_test6)
{
- std::list<
Plain
Text> s;
+ std::list<
String
Text> s;
add (s, "Hello", true, false, false);
add (s, " world ", false, false, false);
add (s, "we are bold.", false, true, false);
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=\"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>");
}
}