X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fssa_reader_test.cc;h=d3a34bfa69ab9d43e6ef3c2bc25ebf2e891acd12;hb=4518eac6c41c51e781d2f17e0f26fe7713ac93c1;hp=589ef9238262a7eb1efd919d1459d5a75215b88f;hpb=013f6aab443f5b7857871b6f0b6b41f7562bc870;p=libsub.git diff --git a/test/ssa_reader_test.cc b/test/ssa_reader_test.cc index 589ef92..d3a34bf 100644 --- a/test/ssa_reader_test.cc +++ b/test/ssa_reader_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2016-2019 Carl Hetherington + Copyright (C) 2016-2021 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,13 +24,12 @@ #include "exceptions.h" #include #include -#include #include #include #include -using std::list; using std::fabs; +using std::vector; BOOST_AUTO_TEST_CASE (ssa_reader_test) { @@ -38,14 +37,14 @@ BOOST_AUTO_TEST_CASE (ssa_reader_test) FILE* f = fopen (p.string().c_str(), "r"); sub::SSAReader reader (f); fclose (f); - list subs = sub::collect > (reader.subtitles ()); + auto subs = sub::collect> (reader.subtitles()); - list::iterator i = subs.begin (); + auto i = subs.begin (); BOOST_REQUIRE (i != subs.end ()); BOOST_CHECK_EQUAL (i->from, sub::Time::from_hms (0, 2, 40, 650)); BOOST_CHECK_EQUAL (i->to, sub::Time::from_hms (0, 2, 41, 790)); - list::iterator j = i->lines.begin(); + auto j = i->lines.begin(); BOOST_REQUIRE (j != i->lines.end ()); BOOST_REQUIRE_EQUAL (j->blocks.size(), 1); sub::Block b = j->blocks.front (); @@ -78,13 +77,13 @@ BOOST_AUTO_TEST_CASE (ssa_reader_test) BOOST_AUTO_TEST_CASE (ssa_reader_line_test1) { sub::RawSubtitle base; - list r = sub::SSAReader::parse_line ( + auto r = sub::SSAReader::parse_line ( base, "This is a line with some {\\i1}italics{\\i0} and then\\nthere is a new line.", 1920, 1080 ); - list::const_iterator i = r.begin (); + auto i = r.begin(); BOOST_CHECK_EQUAL (i->text, "This is a line with some "); BOOST_CHECK_EQUAL (i->italic, false); ++i; @@ -108,13 +107,13 @@ BOOST_AUTO_TEST_CASE (ssa_reader_line_test1) BOOST_AUTO_TEST_CASE (ssa_reader_line_test2) { sub::RawSubtitle base; - list r = sub::SSAReader::parse_line ( + auto r = sub::SSAReader::parse_line ( base, "{\\i1}It's all just italics{\\i0}", 1920, 1080 ); - list::const_iterator i = r.begin (); + auto i = r.begin (); BOOST_CHECK_EQUAL (i->text, "It's all just italics"); BOOST_CHECK_EQUAL (i->italic, true); ++i; @@ -152,7 +151,7 @@ BOOST_AUTO_TEST_CASE (ssa_reader_test2) test ("DKH_UT_EN20160601def.ssa"); test ("dcpsubtest-en.ssa"); test ("dcpsubtest-en.ssa"); - test ("Widdershins_GERMAN_SUBS_grey.ass"); + test ("W_GERMAN_SUBS_grey.ass"); } #define SUB_START(f, t) \ @@ -192,11 +191,11 @@ BOOST_AUTO_TEST_CASE (ssa_reader_test3) FILE* f = fopen (p.string().c_str(), "r"); sub::SSAReader reader (f); fclose (f); - list subs = sub::collect > (reader.subtitles ()); + auto subs = sub::collect> (reader.subtitles()); - list::iterator i = subs.begin (); - list::iterator j; - list::iterator k; + auto i = subs.begin(); + vector::iterator j; + vector::iterator k; /* Hello world */ SUB_START (sub::Time::from_hms (0, 0, 1, 230), sub::Time::from_hms (0, 0, 4, 550)); @@ -281,11 +280,11 @@ BOOST_AUTO_TEST_CASE (ssa_reader_test4) FILE* f = fopen (p.string().c_str(), "r"); sub::SSAReader reader (f); fclose (f); - list subs = sub::collect > (reader.subtitles ()); + auto subs = sub::collect> (reader.subtitles()); - list::iterator i = subs.begin (); - list::iterator j; - list::iterator k; + auto i = subs.begin(); + vector::iterator j; + vector::iterator k; BOOST_REQUIRE (i != subs.end ()); @@ -329,11 +328,11 @@ BOOST_AUTO_TEST_CASE (ssa_reader_test5) FILE* f = fopen (p.string().c_str(), "r"); sub::SSAReader reader (f); fclose (f); - list subs = sub::collect > (reader.subtitles ()); + auto subs = sub::collect> (reader.subtitles()); - list::iterator i = subs.begin (); - list::iterator j; - list::iterator k; + auto i = subs.begin (); + vector::iterator j; + vector::iterator k; BOOST_REQUIRE (i != subs.end ()); @@ -378,11 +377,11 @@ BOOST_AUTO_TEST_CASE (ssa_reader_test6) BOOST_REQUIRE (f); sub::SSAReader reader (f); fclose (f); - list subs = sub::collect > (reader.subtitles ()); + auto subs = sub::collect> (reader.subtitles()); - list::iterator i = subs.begin (); - list::iterator j; - list::iterator k; + auto i = subs.begin (); + vector::iterator j; + vector::iterator k; BOOST_REQUIRE (i != subs.end ()); @@ -459,11 +458,11 @@ BOOST_AUTO_TEST_CASE (ssa_reader_pos) FILE* f = fopen (p.string().c_str(), "r"); sub::SSAReader reader (f); fclose (f); - list subs = sub::collect > (reader.subtitles ()); + auto subs = sub::collect> (reader.subtitles()); - list::iterator i = subs.begin (); - list::iterator j; - list::iterator k; + auto i = subs.begin (); + vector::iterator j; + vector::iterator k; /* Hello world */ SUB_START (sub::Time::from_hms (0, 0, 1, 230), sub::Time::from_hms (0, 0, 4, 550)); @@ -478,13 +477,13 @@ BOOST_AUTO_TEST_CASE (ssa_reader_pos) BOOST_AUTO_TEST_CASE (ssa_reader_fs) { sub::RawSubtitle base; - list r = sub::SSAReader::parse_line ( + auto r = sub::SSAReader::parse_line ( base, "This is a line with some {\\fs64}font sizing.", 1920, 1080 ); - list::const_iterator i = r.begin (); + auto i = r.begin (); BOOST_CHECK_EQUAL (i->text, "This is a line with some "); ++i; BOOST_REQUIRE (i != r.end ()); @@ -500,13 +499,13 @@ BOOST_AUTO_TEST_CASE (ssa_reader_fs) BOOST_AUTO_TEST_CASE (ssa_reader_c) { sub::RawSubtitle base; - list r = sub::SSAReader::parse_line ( + auto r = sub::SSAReader::parse_line ( base, "{\\c&H00FFFF&}Dieser Untertitel ist gelb", 1920, 1080 ); - list::const_iterator i = r.begin (); + auto i = r.begin (); BOOST_CHECK_EQUAL (i->text, "Dieser Untertitel ist gelb"); BOOST_CHECK (i->colour == sub::Colour::from_rgb_hex("ffff00")); ++i;