diff options
Diffstat (limited to 'test/stl_reader_test.cc')
| -rw-r--r-- | test/stl_reader_test.cc | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/test/stl_reader_test.cc b/test/stl_reader_test.cc index 7481ecf..07e1616 100644 --- a/test/stl_reader_test.cc +++ b/test/stl_reader_test.cc @@ -37,56 +37,56 @@ BOOST_AUTO_TEST_CASE (stl_reader_test) BOOST_CHECK (i != subs.end ()); BOOST_CHECK_EQUAL (i->text, " This is a subtitle "); BOOST_CHECK_EQUAL (i->font, "Arial"); - BOOST_CHECK_EQUAL (i->font_size, 42); + BOOST_CHECK_EQUAL (i->font_size.points.get(), 42); BOOST_CHECK_EQUAL (i->bold, false); BOOST_CHECK_EQUAL (i->italic, false); BOOST_CHECK_EQUAL (i->underline, false); BOOST_CHECK_EQUAL (i->line, 0); - BOOST_CHECK_EQUAL (i->frame_from, sub::FrameTime (0, 0, 41, 9)); - BOOST_CHECK_EQUAL (i->frame_to, sub::FrameTime (0, 0, 42, 21)); + BOOST_CHECK_EQUAL (i->from.frame.get(), sub::FrameTime (0, 0, 41, 9)); + BOOST_CHECK_EQUAL (i->to.frame.get(), sub::FrameTime (0, 0, 42, 21)); ++i; BOOST_CHECK (i != subs.end ()); BOOST_CHECK_EQUAL (i->text, " and that's a line break"); BOOST_CHECK_EQUAL (i->font, "Arial"); - BOOST_CHECK_EQUAL (i->font_size, 42); + BOOST_CHECK_EQUAL (i->font_size.points.get(), 42); BOOST_CHECK_EQUAL (i->bold, false); BOOST_CHECK_EQUAL (i->italic, false); BOOST_CHECK_EQUAL (i->underline, false); BOOST_CHECK_EQUAL (i->line, 1); - BOOST_CHECK_EQUAL (i->frame_from, sub::FrameTime (0, 0, 41, 9)); - BOOST_CHECK_EQUAL (i->frame_to, sub::FrameTime (0, 0, 42, 21)); + BOOST_CHECK_EQUAL (i->from.frame.get(), sub::FrameTime (0, 0, 41, 9)); + BOOST_CHECK_EQUAL (i->to.frame.get(), sub::FrameTime (0, 0, 42, 21)); ++i; BOOST_CHECK (i != subs.end ()); BOOST_CHECK_EQUAL (i->text, " This is some "); BOOST_CHECK_EQUAL (i->font, "Arial"); - BOOST_CHECK_EQUAL (i->font_size, 42); + BOOST_CHECK_EQUAL (i->font_size.points.get(), 42); BOOST_CHECK_EQUAL (i->bold, false); BOOST_CHECK_EQUAL (i->italic, false); BOOST_CHECK_EQUAL (i->underline, false); BOOST_CHECK_EQUAL (i->line, 0); - BOOST_CHECK_EQUAL (i->frame_from, sub::FrameTime (0, 1, 1, 1)); - BOOST_CHECK_EQUAL (i->frame_to, sub::FrameTime (0, 1, 2, 10)); + BOOST_CHECK_EQUAL (i->from.frame.get(), sub::FrameTime (0, 1, 1, 1)); + BOOST_CHECK_EQUAL (i->to.frame.get(), sub::FrameTime (0, 1, 2, 10)); ++i; BOOST_CHECK (i != subs.end ()); BOOST_CHECK_EQUAL (i->text, "bold"); BOOST_CHECK_EQUAL (i->font, "Arial"); - BOOST_CHECK_EQUAL (i->font_size, 42); + BOOST_CHECK_EQUAL (i->font_size.points.get(), 42); BOOST_CHECK_EQUAL (i->bold, true); BOOST_CHECK_EQUAL (i->italic, false); BOOST_CHECK_EQUAL (i->underline, false); - BOOST_CHECK_EQUAL (i->frame_from, sub::FrameTime (0, 1, 1, 1)); - BOOST_CHECK_EQUAL (i->frame_to, sub::FrameTime (0, 1, 2, 10)); + BOOST_CHECK_EQUAL (i->from.frame.get(), sub::FrameTime (0, 1, 1, 1)); + BOOST_CHECK_EQUAL (i->to.frame.get(), sub::FrameTime (0, 1, 2, 10)); ++i; BOOST_CHECK (i != subs.end ()); BOOST_CHECK_EQUAL (i->text, " and some "); BOOST_CHECK_EQUAL (i->font, "Arial"); - BOOST_CHECK_EQUAL (i->font_size, 42); - BOOST_CHECK_EQUAL (i->frame_from, sub::FrameTime (0, 1, 1, 1)); - BOOST_CHECK_EQUAL (i->frame_to, sub::FrameTime (0, 1, 2, 10)); + BOOST_CHECK_EQUAL (i->font_size.points.get(), 42); + BOOST_CHECK_EQUAL (i->from.frame.get(), sub::FrameTime (0, 1, 1, 1)); + BOOST_CHECK_EQUAL (i->to.frame.get(), sub::FrameTime (0, 1, 2, 10)); BOOST_CHECK_EQUAL (i->bold, false); BOOST_CHECK_EQUAL (i->italic, false); BOOST_CHECK_EQUAL (i->underline, false); @@ -96,47 +96,47 @@ BOOST_AUTO_TEST_CASE (stl_reader_test) BOOST_CHECK (i != subs.end ()); BOOST_CHECK_EQUAL (i->text, "bold italic"); BOOST_CHECK_EQUAL (i->font, "Arial"); - BOOST_CHECK_EQUAL (i->font_size, 42); + BOOST_CHECK_EQUAL (i->font_size.points.get(), 42); BOOST_CHECK_EQUAL (i->bold, true); BOOST_CHECK_EQUAL (i->italic, true); BOOST_CHECK_EQUAL (i->underline, false); BOOST_CHECK_EQUAL (i->line, 0); - BOOST_CHECK_EQUAL (i->frame_from, sub::FrameTime (0, 1, 1, 1)); - BOOST_CHECK_EQUAL (i->frame_to, sub::FrameTime (0, 1, 2, 10)); + BOOST_CHECK_EQUAL (i->from.frame.get(), sub::FrameTime (0, 1, 1, 1)); + BOOST_CHECK_EQUAL (i->to.frame.get(), sub::FrameTime (0, 1, 2, 10)); ++i; BOOST_CHECK (i != subs.end ()); BOOST_CHECK_EQUAL (i->text, " and some "); BOOST_CHECK_EQUAL (i->font, "Arial"); - BOOST_CHECK_EQUAL (i->font_size, 42); + BOOST_CHECK_EQUAL (i->font_size.points.get(), 42); BOOST_CHECK_EQUAL (i->bold, false); BOOST_CHECK_EQUAL (i->italic, false); BOOST_CHECK_EQUAL (i->underline, false); - BOOST_CHECK_EQUAL (i->frame_from, sub::FrameTime (0, 1, 1, 1)); - BOOST_CHECK_EQUAL (i->frame_to, sub::FrameTime (0, 1, 2, 10)); + BOOST_CHECK_EQUAL (i->from.frame.get(), sub::FrameTime (0, 1, 1, 1)); + BOOST_CHECK_EQUAL (i->to.frame.get(), sub::FrameTime (0, 1, 2, 10)); ++i; BOOST_CHECK (i != subs.end ()); BOOST_CHECK_EQUAL (i->text, "underlined"); BOOST_CHECK_EQUAL (i->font, "Arial"); - BOOST_CHECK_EQUAL (i->font_size, 42); + BOOST_CHECK_EQUAL (i->font_size.points.get(), 42); BOOST_CHECK_EQUAL (i->bold, false); BOOST_CHECK_EQUAL (i->italic, false); BOOST_CHECK_EQUAL (i->underline, true); BOOST_CHECK_EQUAL (i->line, 0); - BOOST_CHECK_EQUAL (i->frame_from, sub::FrameTime (0, 1, 1, 1)); - BOOST_CHECK_EQUAL (i->frame_to, sub::FrameTime (0, 1, 2, 10)); + BOOST_CHECK_EQUAL (i->from.frame.get(), sub::FrameTime (0, 1, 1, 1)); + BOOST_CHECK_EQUAL (i->to.frame.get(), sub::FrameTime (0, 1, 2, 10)); ++i; BOOST_CHECK_EQUAL (i->text, "."); BOOST_CHECK_EQUAL (i->font, "Arial"); - BOOST_CHECK_EQUAL (i->font_size, 42); + BOOST_CHECK_EQUAL (i->font_size.points.get(), 42); BOOST_CHECK_EQUAL (i->bold, false); BOOST_CHECK_EQUAL (i->italic, false); BOOST_CHECK_EQUAL (i->underline, false); BOOST_CHECK_EQUAL (i->line, 0); - BOOST_CHECK_EQUAL (i->frame_from, sub::FrameTime (0, 1, 1, 1)); - BOOST_CHECK_EQUAL (i->frame_to, sub::FrameTime (0, 1, 2, 10)); + BOOST_CHECK_EQUAL (i->from.frame.get(), sub::FrameTime (0, 1, 1, 1)); + BOOST_CHECK_EQUAL (i->to.frame.get(), sub::FrameTime (0, 1, 2, 10)); ++i; BOOST_CHECK (i == subs.end ()); |