summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-04-05 00:22:32 +0100
committerCarl Hetherington <cth@carlh.net>2016-04-05 00:22:32 +0100
commitbc118b663b0582cf4afdce3000beb8bac35b16ef (patch)
treeac058ad2af7c88705606e7fe139d4d1a4ff80ac2 /test
parentbc7089956cefc9f8528918f8a5d48174ab680f13 (diff)
Basic untested support for bold in subtitles.
Diffstat (limited to 'test')
-rw-r--r--test/asset_test.cc2
-rw-r--r--test/read_interop_subtitle_test.cc23
-rw-r--r--test/write_subtitle_test.cc2
3 files changed, 26 insertions, 1 deletions
diff --git a/test/asset_test.cc b/test/asset_test.cc
index c53aca68..caf5e76c 100644
--- a/test/asset_test.cc
+++ b/test/asset_test.cc
@@ -26,7 +26,7 @@ using boost::shared_ptr;
class DummyAsset : public dcp::Asset
{
protected:
- std::string pkl_type (dcp::Standard standard) const {
+ std::string pkl_type (dcp::Standard) const {
return "none";
}
};
diff --git a/test/read_interop_subtitle_test.cc b/test/read_interop_subtitle_test.cc
index a66327f1..7cbb5803 100644
--- a/test/read_interop_subtitle_test.cc
+++ b/test/read_interop_subtitle_test.cc
@@ -49,6 +49,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
string ("theFontId"),
false,
+ false,
dcp::Colour (255, 255, 255),
39,
1.0,
@@ -70,6 +71,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
string ("theFontId"),
true,
+ false,
dcp::Colour (255, 255, 255),
39,
1.0,
@@ -88,6 +90,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
string ("theFontId"),
false,
+ false,
dcp::Colour (255, 255, 255),
39,
1.0,
@@ -109,6 +112,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
string ("theFontId"),
false,
+ false,
dcp::Colour (255, 255, 255),
39,
1.0,
@@ -130,6 +134,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
string ("theFontId"),
false,
+ false,
dcp::Colour (255, 255, 255),
39,
1.0,
@@ -157,6 +162,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
string ("theFont"),
true,
+ false,
dcp::Colour (255, 255, 255),
42,
1.0,
@@ -175,6 +181,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
string ("theFont"),
true,
+ false,
dcp::Colour (255, 255, 255),
42,
1.0,
@@ -196,6 +203,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
string ("theFont"),
true,
+ false,
dcp::Colour (255, 255, 255),
42,
1.0,
@@ -214,6 +222,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
string ("theFont"),
true,
+ false,
dcp::Colour (255, 255, 255),
42,
1.0,
@@ -235,6 +244,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
string ("theFont"),
true,
+ false,
dcp::Colour (255, 255, 255),
42,
1.0,
@@ -253,6 +263,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
string ("theFont"),
true,
+ false,
dcp::Colour (255, 255, 255),
42,
1.0,
@@ -274,6 +285,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
string ("theFont"),
true,
+ false,
dcp::Colour (255, 255, 255),
42,
1.0,
@@ -292,6 +304,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
string ("theFont"),
true,
+ false,
dcp::Colour (255, 255, 255),
42,
1.0,
@@ -313,6 +326,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
string ("theFont"),
true,
+ false,
dcp::Colour (255, 255, 255),
42,
1.0,
@@ -331,6 +345,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
string ("theFont"),
true,
+ false,
dcp::Colour (255, 255, 255),
42,
1.0,
@@ -352,6 +367,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
string ("theFont"),
false,
+ false,
dcp::Colour (255, 255, 255),
42,
1.0,
@@ -370,6 +386,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
string ("theFont"),
false,
+ false,
dcp::Colour (255, 255, 255),
42,
1.0,
@@ -391,6 +408,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
string ("theFont"),
false,
+ false,
dcp::Colour (255, 255, 255),
42,
1.0,
@@ -409,6 +427,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
string ("theFont"),
false,
+ false,
dcp::Colour (255, 255, 255),
42,
1.0,
@@ -430,6 +449,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
string ("theFont"),
false,
+ false,
dcp::Colour (255, 255, 255),
42,
1.0,
@@ -448,6 +468,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
string ("theFont"),
false,
+ false,
dcp::Colour (255, 255, 255),
42,
1.0,
@@ -469,6 +490,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
string ("theFont"),
true,
+ false,
dcp::Colour (255, 255, 255),
42,
1.0,
@@ -487,6 +509,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
string ("theFont"),
true,
+ false,
dcp::Colour (255, 255, 255),
42,
1.0,
diff --git a/test/write_subtitle_test.cc b/test/write_subtitle_test.cc
index 8b50b0e3..e407b81f 100644
--- a/test/write_subtitle_test.cc
+++ b/test/write_subtitle_test.cc
@@ -38,6 +38,7 @@ BOOST_AUTO_TEST_CASE (write_subtitle_test)
dcp::SubtitleString (
string ("Frutiger"),
false,
+ false,
dcp::Colour (255, 255, 255),
48,
1.0,
@@ -59,6 +60,7 @@ BOOST_AUTO_TEST_CASE (write_subtitle_test)
dcp::SubtitleString (
boost::optional<string> (),
true,
+ false,
dcp::Colour (128, 0, 64),
91,
1.0,