diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-10-06 13:29:36 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-10-06 13:29:36 +0100 |
| commit | 4ada3e7583dfdc658dbebca3c3603be1e3477c12 (patch) | |
| tree | 0516fdd142b79e7083ed3d455fe45fffce26a9a8 /test/subrip_reader_test.cc | |
| parent | 86440b2afe0a2b83a7e810f37b1f65dbddee90e8 (diff) | |
Template-ize collect so that any container can be used.
Add new vertical reference of TOP_OF_SUBTITLE, and use references
with line numbers as well as proportional specifiers.
Add a couple of methods to MetricTime.
Diffstat (limited to 'test/subrip_reader_test.cc')
| -rw-r--r-- | test/subrip_reader_test.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/test/subrip_reader_test.cc b/test/subrip_reader_test.cc index e7680a9..42eacfb 100644 --- a/test/subrip_reader_test.cc +++ b/test/subrip_reader_test.cc @@ -35,7 +35,7 @@ BOOST_AUTO_TEST_CASE (subrip_reader_test) FILE* f = fopen ("test/data/test.srt", "r"); sub::SubripReader reader (f); fclose (f); - list<sub::Subtitle> subs = sub::collect (reader.subtitles ()); + list<sub::Subtitle> subs = sub::collect<std::list<sub::Subtitle> > (reader.subtitles ()); list<sub::Subtitle>::iterator i = subs.begin (); @@ -56,8 +56,8 @@ BOOST_AUTO_TEST_CASE (subrip_reader_test) BOOST_CHECK_EQUAL (b.bold, false); BOOST_CHECK_EQUAL (b.italic, false); BOOST_CHECK_EQUAL (b.underline, false); - BOOST_CHECK_CLOSE (j->vertical_position.proportional.get(), 0.7, 1); - BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::TOP); + BOOST_CHECK_EQUAL (j->vertical_position.line.get(), 0); + BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::TOP_OF_SUBTITLE); ++j; BOOST_CHECK (j != i->lines.end ()); @@ -69,8 +69,8 @@ BOOST_AUTO_TEST_CASE (subrip_reader_test) BOOST_CHECK_EQUAL (b.bold, false); BOOST_CHECK_EQUAL (b.italic, false); BOOST_CHECK_EQUAL (b.underline, false); - BOOST_CHECK_CLOSE (j->vertical_position.proportional.get(), 0.8, 1); - BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::TOP); + BOOST_CHECK_EQUAL (j->vertical_position.line.get(), 1); + BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::TOP_OF_SUBTITLE); ++i; @@ -83,7 +83,8 @@ BOOST_AUTO_TEST_CASE (subrip_reader_test) BOOST_CHECK_EQUAL (i->lines.size(), 1); sub::Line l = i->lines.front (); BOOST_CHECK_EQUAL (l.blocks.size(), 7); - BOOST_CHECK_CLOSE (l.vertical_position.proportional.get(), 0.7, 1); + BOOST_CHECK_EQUAL (l.vertical_position.line.get(), 0); + BOOST_CHECK_EQUAL (l.vertical_position.reference.get(), sub::TOP_OF_SUBTITLE); list<sub::Block>::iterator k = l.blocks.begin (); @@ -159,7 +160,7 @@ BOOST_AUTO_TEST_CASE (subrip_reader_test2) FILE* f = fopen ("test/data/test2.srt", "r"); sub::SubripReader reader (f); fclose (f); - list<sub::Subtitle> subs = sub::collect (reader.subtitles ()); + list<sub::Subtitle> subs = sub::collect<list<sub::Subtitle> > (reader.subtitles ()); list<sub::Subtitle>::const_iterator i = subs.begin(); |