projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Believed fix for error when calculating the position in the output DCP of a reference...
[dcpomatic.git]
/
test
/
render_subtitles_test.cc
diff --git
a/test/render_subtitles_test.cc
b/test/render_subtitles_test.cc
index 99e1e7a1b11d531210aeb9b22e0536e3e73d61ff..d850062c2a8893168e3a32e4dc546b61510d4509 100644
(file)
--- a/
test/render_subtitles_test.cc
+++ b/
test/render_subtitles_test.cc
@@
-18,15
+18,19
@@
*/
*/
+
/** @file test/render_text_test.cc
* @brief Check markup of subtitles for rendering.
* @ingroup feature
*/
/** @file test/render_text_test.cc
* @brief Check markup of subtitles for rendering.
* @ingroup feature
*/
+
#include "lib/render_text.h"
#include "lib/render_text.h"
+#include "lib/string_text.h"
#include <dcp/subtitle_string.h>
#include <boost/test/unit_test.hpp>
#include <dcp/subtitle_string.h>
#include <boost/test/unit_test.hpp>
+
static void
add (std::list<StringText>& s, std::string text, bool italic, bool bold, bool underline)
{
static void
add (std::list<StringText>& s, std::string text, bool italic, bool bold, bool underline)
{
@@
-43,17
+47,19
@@
add (std::list<StringText>& s, std::string text, bool italic, bool bold, bool un
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
+ 2,
+ std::shared_ptr<dcpomatic::Font>()
)
);
}
)
);
}
@@
-63,7
+69,7
@@
BOOST_AUTO_TEST_CASE (render_markup_test1)
{
std::list<StringText> s;
add (s, "Hello", false, false, false);
{
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=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
}
/** Test marked_up() in render_text.cc */
}
/** Test marked_up() in render_text.cc */
@@
-71,7
+77,7
@@
BOOST_AUTO_TEST_CASE (render_markup_test2)
{
std::list<StringText> s;
add (s, "Hello", false, true, false);
{
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=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
}
}
@@
-80,7
+86,7
@@
BOOST_AUTO_TEST_CASE (render_markup_test3)
{
std::list<StringText> s;
add (s, "Hello", true, true, false);
{
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=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
}
/** Test marked_up() in render_text.cc */
}
/** Test marked_up() in render_text.cc */
@@
-88,7
+94,7
@@
BOOST_AUTO_TEST_CASE (render_markup_test4)
{
std::list<StringText> s;
add (s, "Hello", true, true, true);
{
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=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
}
/** Test marked_up() in render_text.cc */
}
/** Test marked_up() in render_text.cc */
@@
-97,7
+103,7
@@
BOOST_AUTO_TEST_CASE (render_markup_test5)
std::list<StringText> s;
add (s, "Hello", false, true, false);
add (s, " world.", false, false, false);
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=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span><span size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\"> world.</span>");
}
/** Test marked_up() in render_text.cc */
}
/** Test marked_up() in render_text.cc */
@@
-107,5
+113,5
@@
BOOST_AUTO_TEST_CASE (render_markup_test6)
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>");
}
}