summaryrefslogtreecommitdiff
path: root/test/stl_reader_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'test/stl_reader_test.cc')
-rw-r--r--test/stl_reader_test.cc36
1 files changed, 18 insertions, 18 deletions
diff --git a/test/stl_reader_test.cc b/test/stl_reader_test.cc
index 92b0d58..7481ecf 100644
--- a/test/stl_reader_test.cc
+++ b/test/stl_reader_test.cc
@@ -42,8 +42,8 @@ BOOST_AUTO_TEST_CASE (stl_reader_test)
BOOST_CHECK_EQUAL (i->italic, false);
BOOST_CHECK_EQUAL (i->underline, false);
BOOST_CHECK_EQUAL (i->line, 0);
- BOOST_CHECK_EQUAL (i->from, sub::Time (0, 0, 41, 9));
- BOOST_CHECK_EQUAL (i->to, sub::Time (0, 0, 42, 21));
+ BOOST_CHECK_EQUAL (i->frame_from, sub::FrameTime (0, 0, 41, 9));
+ BOOST_CHECK_EQUAL (i->frame_to, sub::FrameTime (0, 0, 42, 21));
++i;
BOOST_CHECK (i != subs.end ());
@@ -54,8 +54,8 @@ BOOST_AUTO_TEST_CASE (stl_reader_test)
BOOST_CHECK_EQUAL (i->italic, false);
BOOST_CHECK_EQUAL (i->underline, false);
BOOST_CHECK_EQUAL (i->line, 1);
- BOOST_CHECK_EQUAL (i->from, sub::Time (0, 0, 41, 9));
- BOOST_CHECK_EQUAL (i->to, sub::Time (0, 0, 42, 21));
+ BOOST_CHECK_EQUAL (i->frame_from, sub::FrameTime (0, 0, 41, 9));
+ BOOST_CHECK_EQUAL (i->frame_to, sub::FrameTime (0, 0, 42, 21));
++i;
BOOST_CHECK (i != subs.end ());
@@ -66,8 +66,8 @@ BOOST_AUTO_TEST_CASE (stl_reader_test)
BOOST_CHECK_EQUAL (i->italic, false);
BOOST_CHECK_EQUAL (i->underline, false);
BOOST_CHECK_EQUAL (i->line, 0);
- BOOST_CHECK_EQUAL (i->from, sub::Time (0, 1, 1, 1));
- BOOST_CHECK_EQUAL (i->to, sub::Time (0, 1, 2, 10));
+ BOOST_CHECK_EQUAL (i->frame_from, sub::FrameTime (0, 1, 1, 1));
+ BOOST_CHECK_EQUAL (i->frame_to, sub::FrameTime (0, 1, 2, 10));
++i;
BOOST_CHECK (i != subs.end ());
@@ -77,16 +77,16 @@ BOOST_AUTO_TEST_CASE (stl_reader_test)
BOOST_CHECK_EQUAL (i->bold, true);
BOOST_CHECK_EQUAL (i->italic, false);
BOOST_CHECK_EQUAL (i->underline, false);
- BOOST_CHECK_EQUAL (i->from, sub::Time (0, 1, 1, 1));
- BOOST_CHECK_EQUAL (i->to, sub::Time (0, 1, 2, 10));
+ BOOST_CHECK_EQUAL (i->frame_from, sub::FrameTime (0, 1, 1, 1));
+ BOOST_CHECK_EQUAL (i->frame_to, 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->from, sub::Time (0, 1, 1, 1));
- BOOST_CHECK_EQUAL (i->to, sub::Time (0, 1, 2, 10));
+ 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->bold, false);
BOOST_CHECK_EQUAL (i->italic, false);
BOOST_CHECK_EQUAL (i->underline, false);
@@ -101,8 +101,8 @@ BOOST_AUTO_TEST_CASE (stl_reader_test)
BOOST_CHECK_EQUAL (i->italic, true);
BOOST_CHECK_EQUAL (i->underline, false);
BOOST_CHECK_EQUAL (i->line, 0);
- BOOST_CHECK_EQUAL (i->from, sub::Time (0, 1, 1, 1));
- BOOST_CHECK_EQUAL (i->to, sub::Time (0, 1, 2, 10));
+ BOOST_CHECK_EQUAL (i->frame_from, sub::FrameTime (0, 1, 1, 1));
+ BOOST_CHECK_EQUAL (i->frame_to, sub::FrameTime (0, 1, 2, 10));
++i;
BOOST_CHECK (i != subs.end ());
@@ -112,8 +112,8 @@ BOOST_AUTO_TEST_CASE (stl_reader_test)
BOOST_CHECK_EQUAL (i->bold, false);
BOOST_CHECK_EQUAL (i->italic, false);
BOOST_CHECK_EQUAL (i->underline, false);
- BOOST_CHECK_EQUAL (i->from, sub::Time (0, 1, 1, 1));
- BOOST_CHECK_EQUAL (i->to, sub::Time (0, 1, 2, 10));
+ BOOST_CHECK_EQUAL (i->frame_from, sub::FrameTime (0, 1, 1, 1));
+ BOOST_CHECK_EQUAL (i->frame_to, sub::FrameTime (0, 1, 2, 10));
++i;
BOOST_CHECK (i != subs.end ());
@@ -124,8 +124,8 @@ BOOST_AUTO_TEST_CASE (stl_reader_test)
BOOST_CHECK_EQUAL (i->italic, false);
BOOST_CHECK_EQUAL (i->underline, true);
BOOST_CHECK_EQUAL (i->line, 0);
- BOOST_CHECK_EQUAL (i->from, sub::Time (0, 1, 1, 1));
- BOOST_CHECK_EQUAL (i->to, sub::Time (0, 1, 2, 10));
+ BOOST_CHECK_EQUAL (i->frame_from, sub::FrameTime (0, 1, 1, 1));
+ BOOST_CHECK_EQUAL (i->frame_to, sub::FrameTime (0, 1, 2, 10));
++i;
BOOST_CHECK_EQUAL (i->text, ".");
@@ -135,8 +135,8 @@ BOOST_AUTO_TEST_CASE (stl_reader_test)
BOOST_CHECK_EQUAL (i->italic, false);
BOOST_CHECK_EQUAL (i->underline, false);
BOOST_CHECK_EQUAL (i->line, 0);
- BOOST_CHECK_EQUAL (i->from, sub::Time (0, 1, 1, 1));
- BOOST_CHECK_EQUAL (i->to, sub::Time (0, 1, 2, 10));
+ BOOST_CHECK_EQUAL (i->frame_from, sub::FrameTime (0, 1, 1, 1));
+ BOOST_CHECK_EQUAL (i->frame_to, sub::FrameTime (0, 1, 2, 10));
++i;
BOOST_CHECK (i == subs.end ());