Handle unicode LINE SEPARATOR properly in subrip files.

[libsub.git] / test / stl_text_reader_test.cc

diff --git a/test/stl_text_reader_test.cc b/test/stl_text_reader_test.cc
index be58472a0208f193eee6530eed73eb366dbe0450..f0ec9699dd1ad644e0fd369b266238696738b9d2 100644 (file)
--- a/test/stl_text_reader_test.cc
+++ b/test/stl_text_reader_test.cc
@@ -23,7 +23,6 @@
 #include <boost/test/unit_test.hpp>
 #include <fstream>
 
-using std::list;
 using std::ifstream;
 using std::vector;
 
@@ -32,23 +31,23 @@ BOOST_AUTO_TEST_CASE (stl_text_reader_test)
 {
        ifstream file ("test/data/test_text.stl");
        sub::STLTextReader reader (file);
-       list<sub::Subtitle> subs = sub::collect (reader.subtitles ());
+       auto subs = sub::collect<vector<sub::Subtitle>> (reader.subtitles());
+
+       auto i = subs.begin ();
 
-       list<sub::Subtitle>::iterator i = subs.begin ();
 
-       
        /* First subtitle */
 
        BOOST_CHECK (i != subs.end ());
-       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));
-       
-       list<sub::Line>::iterator j = i->lines.begin ();
+       BOOST_CHECK_EQUAL (i->from, sub::Time::from_hmsf (0, 0, 41, 9));
+       BOOST_CHECK_EQUAL (i->to, sub::Time::from_hmsf (0, 0, 42, 21));
+
+       auto j = i->lines.begin ();
        BOOST_CHECK (j != i->lines.end ());
        BOOST_CHECK_EQUAL (j->blocks.size(), 1);
-       sub::Block b = j->blocks.front ();
+       auto 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 +59,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);
@@ -68,23 +67,23 @@ BOOST_AUTO_TEST_CASE (stl_text_reader_test)
        BOOST_CHECK_EQUAL (j->vertical_position.line.get(), 1);
        ++i;
 
-       
+
        /* Second subtitle */
-       
+
        BOOST_CHECK (i != subs.end ());
-       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->from, sub::Time::from_hmsf (0, 1, 1, 1));
+       BOOST_CHECK_EQUAL (i->to, sub::Time::from_hmsf (0, 1, 2, 10));
+
        BOOST_CHECK_EQUAL (i->lines.size(), 1);
        sub::Line l = i->lines.front ();
        BOOST_CHECK_EQUAL (l.blocks.size(), 7);
        BOOST_CHECK_EQUAL (l.vertical_position.line.get(), 0);
 
-       list<sub::Block>::iterator k = l.blocks.begin ();
-       
+       auto k = l.blocks.begin ();
+
        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 +92,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 +101,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 +110,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 +119,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 +128,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,13 +137,13 @@ 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);
        BOOST_CHECK_EQUAL (k->underline, false);
        ++k;
-       
+
        BOOST_CHECK (k == l.blocks.end ());
 }