diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-12 21:06:29 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-12 21:06:29 +0000 |
| commit | 68560d1e94ee311d7fbfcdf98a704decef232108 (patch) | |
| tree | 2456ee37413e4b0b34a6ccfc783c4ed751c94be1 /test/stl_text_reader_test.cc | |
| parent | 670020792233d50b14363e54db6808733d5d2171 (diff) | |
Various fixes.
Diffstat (limited to 'test/stl_text_reader_test.cc')
| -rw-r--r-- | test/stl_text_reader_test.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/test/stl_text_reader_test.cc b/test/stl_text_reader_test.cc index b21ecee..c6f58b3 100644 --- a/test/stl_text_reader_test.cc +++ b/test/stl_text_reader_test.cc @@ -48,7 +48,7 @@ BOOST_AUTO_TEST_CASE (stl_text_reader_test) BOOST_CHECK_EQUAL (j->blocks.size(), 1); sub::Block b = j->blocks.front (); BOOST_CHECK_EQUAL (b.text, " This is a subtitle "); - BOOST_CHECK_EQUAL (b.font, "Arial"); + BOOST_CHECK_EQUAL (b.font.get(), "Arial"); BOOST_CHECK_EQUAL (b.font_size.points().get(), 42); BOOST_CHECK_EQUAL (b.bold, false); BOOST_CHECK_EQUAL (b.italic, false); @@ -60,7 +60,7 @@ BOOST_AUTO_TEST_CASE (stl_text_reader_test) BOOST_CHECK_EQUAL (j->blocks.size(), 1); b = j->blocks.front (); BOOST_CHECK_EQUAL (b.text, " and that's a line break"); - BOOST_CHECK_EQUAL (b.font, "Arial"); + BOOST_CHECK_EQUAL (b.font.get(), "Arial"); BOOST_CHECK_EQUAL (b.font_size.points().get(), 42); BOOST_CHECK_EQUAL (b.bold, false); BOOST_CHECK_EQUAL (b.italic, false); @@ -84,7 +84,7 @@ BOOST_AUTO_TEST_CASE (stl_text_reader_test) BOOST_CHECK (k != l.blocks.end ()); BOOST_CHECK_EQUAL (k->text, " This is some "); - BOOST_CHECK_EQUAL (k->font, "Arial"); + BOOST_CHECK_EQUAL (k->font.get(), "Arial"); BOOST_CHECK_EQUAL (k->font_size.points().get(), 42); BOOST_CHECK_EQUAL (k->bold, false); BOOST_CHECK_EQUAL (k->italic, false); @@ -93,7 +93,7 @@ BOOST_AUTO_TEST_CASE (stl_text_reader_test) BOOST_CHECK (k != l.blocks.end ()); BOOST_CHECK_EQUAL (k->text, "bold"); - BOOST_CHECK_EQUAL (k->font, "Arial"); + BOOST_CHECK_EQUAL (k->font.get(), "Arial"); BOOST_CHECK_EQUAL (k->font_size.points().get(), 42); BOOST_CHECK_EQUAL (k->bold, true); BOOST_CHECK_EQUAL (k->italic, false); @@ -102,7 +102,7 @@ BOOST_AUTO_TEST_CASE (stl_text_reader_test) BOOST_CHECK (k != l.blocks.end ()); BOOST_CHECK_EQUAL (k->text, " and some "); - BOOST_CHECK_EQUAL (k->font, "Arial"); + BOOST_CHECK_EQUAL (k->font.get(), "Arial"); BOOST_CHECK_EQUAL (k->font_size.points().get(), 42); BOOST_CHECK_EQUAL (k->bold, false); BOOST_CHECK_EQUAL (k->italic, false); @@ -111,7 +111,7 @@ BOOST_AUTO_TEST_CASE (stl_text_reader_test) BOOST_CHECK (k != l.blocks.end ()); BOOST_CHECK_EQUAL (k->text, "bold italic"); - BOOST_CHECK_EQUAL (k->font, "Arial"); + BOOST_CHECK_EQUAL (k->font.get(), "Arial"); BOOST_CHECK_EQUAL (k->font_size.points().get(), 42); BOOST_CHECK_EQUAL (k->bold, true); BOOST_CHECK_EQUAL (k->italic, true); @@ -120,7 +120,7 @@ BOOST_AUTO_TEST_CASE (stl_text_reader_test) BOOST_CHECK (k != l.blocks.end ()); BOOST_CHECK_EQUAL (k->text, " and some "); - BOOST_CHECK_EQUAL (k->font, "Arial"); + BOOST_CHECK_EQUAL (k->font.get(), "Arial"); BOOST_CHECK_EQUAL (k->font_size.points().get(), 42); BOOST_CHECK_EQUAL (k->bold, false); BOOST_CHECK_EQUAL (k->italic, false); @@ -129,7 +129,7 @@ BOOST_AUTO_TEST_CASE (stl_text_reader_test) BOOST_CHECK (k != l.blocks.end ()); BOOST_CHECK_EQUAL (k->text, "underlined"); - BOOST_CHECK_EQUAL (k->font, "Arial"); + BOOST_CHECK_EQUAL (k->font.get(), "Arial"); BOOST_CHECK_EQUAL (k->font_size.points().get(), 42); BOOST_CHECK_EQUAL (k->bold, false); BOOST_CHECK_EQUAL (k->italic, false); @@ -138,7 +138,7 @@ BOOST_AUTO_TEST_CASE (stl_text_reader_test) BOOST_CHECK (k != l.blocks.end ()); BOOST_CHECK_EQUAL (k->text, "."); - BOOST_CHECK_EQUAL (k->font, "Arial"); + BOOST_CHECK_EQUAL (k->font.get(), "Arial"); BOOST_CHECK_EQUAL (k->font_size.points().get(), 42); BOOST_CHECK_EQUAL (k->bold, false); BOOST_CHECK_EQUAL (k->italic, false); |