*/
-#include "interop_dcp_reader.h"
+#include "dcp_reader.h"
#include "collect.h"
#include <boost/test/unit_test.hpp>
#include <boost/optional/optional_io.hpp>
-#include <fstream>
-#include <iostream>
-using std::list;
-using std::cout;
-using std::ifstream;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::vector;
/* Test reading of a DCP XML file */
BOOST_AUTO_TEST_CASE (dcp_reader_test1)
{
- sub::InteropDCPReader reader ("test/data/test1.xml");
- list<sub::Subtitle> subs = sub::collect<list<sub::Subtitle> > (reader.subtitles ());
+ sub::DCPReader reader ("test/data/test1.xml");
+ auto subs = sub::collect<vector<sub::Subtitle>> (reader.subtitles());
- list<sub::Subtitle>::iterator i = subs.begin ();
- BOOST_REQUIRE (i != subs.end ());
+ auto i = subs.begin();
+ BOOST_REQUIRE (i != subs.end());
BOOST_CHECK_EQUAL (i->from, sub::Time::from_hms (0, 0, 5, 198 * 4));
BOOST_CHECK_EQUAL (i->to, sub::Time::from_hms (0, 0, 7, 115 * 4));
BOOST_CHECK_EQUAL (i->fade_up.get(), sub::Time::from_hms (0, 0, 0, 4));
BOOST_CHECK_EQUAL (i->fade_down.get(), sub::Time::from_hms (0, 0, 0, 4));
{
- list<sub::Line>::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 ();
BOOST_CHECK_EQUAL (i->fade_down.get(), sub::Time::from_hms (0, 0, 0, 4));
{
- list<sub::Line>::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 ();
+ auto b = j->blocks.front ();
BOOST_CHECK_EQUAL (b.font.get(), "theFontId");
BOOST_CHECK_EQUAL (b.italic, true);
BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
BOOST_CHECK_EQUAL (i->fade_down.get(), sub::Time::from_hms (0, 0, 0, 4));
{
- list<sub::Line>::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 ();
+ auto b = j->blocks.front();
BOOST_CHECK_EQUAL (b.font.get(), "theFontId");
BOOST_CHECK_EQUAL (b.italic, false);
BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
BOOST_CHECK_EQUAL (i->fade_down.get(), sub::Time::from_hms (0, 0, 0, 4));
{
- list<sub::Line>::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 ();
+ auto b = j->blocks.front();
BOOST_CHECK_EQUAL (b.font.get(), "theFontId");
BOOST_CHECK_EQUAL (b.italic, false);
BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
/* And another one */
BOOST_AUTO_TEST_CASE (dcp_reader_test2)
{
- sub::InteropDCPReader reader ("test/data/test2.xml");
- list<sub::Subtitle> subs = sub::collect<list<sub::Subtitle> > (reader.subtitles ());
+ sub::DCPReader reader ("test/data/test2.xml");
+ auto subs = sub::collect<vector<sub::Subtitle>> (reader.subtitles ());
- list<sub::Subtitle>::iterator i = subs.begin ();
+ auto i = subs.begin ();
BOOST_REQUIRE (i != subs.end ());
BOOST_CHECK_EQUAL (i->from, sub::Time::from_hms (0, 0, 41, 62 * 4));
BOOST_CHECK_EQUAL (i->to, sub::Time::from_hms (0, 0, 43, 52 * 4));
BOOST_CHECK_EQUAL (i->fade_down.get(), sub::Time::from_hms (0, 0, 0, 0));
{
- list<sub::Line>::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 ();
+ auto b = j->blocks.front ();
BOOST_CHECK_EQUAL (b.font.get(), "theFont");
BOOST_CHECK_EQUAL (b.italic, true);
BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
BOOST_CHECK_EQUAL (i->fade_down.get(), sub::Time::from_hms (0, 0, 0, 0));
{
- list<sub::Line>::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 ();
+ auto b = j->blocks.front ();
BOOST_CHECK_EQUAL (b.font.get(), "theFont");
BOOST_CHECK_EQUAL (b.italic, true);
BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
BOOST_CHECK_EQUAL (i->fade_down.get(), sub::Time::from_hms (0, 0, 0, 0));
{
- list<sub::Line>::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 ();
+ auto b = j->blocks.front();
BOOST_CHECK_EQUAL (b.font.get(), "theFont");
BOOST_CHECK_EQUAL (b.italic, true);
BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
BOOST_CHECK_EQUAL (i->fade_down.get(), sub::Time::from_hms (0, 0, 0, 0));
{
- list<sub::Line>::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 ();
+ auto b = j->blocks.front();
BOOST_CHECK_EQUAL (b.font.get(), "theFont");
BOOST_CHECK_EQUAL (b.italic, true);
BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
BOOST_CHECK_EQUAL (i->fade_down.get(), sub::Time::from_hms (0, 0, 0, 0));
{
- list<sub::Line>::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 ();
+ auto b = j->blocks.front();
BOOST_CHECK_EQUAL (b.font.get(), "theFont");
BOOST_CHECK_EQUAL (b.italic, true);
BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
BOOST_CHECK_EQUAL (i->fade_down.get(), sub::Time::from_hms (0, 0, 0, 0));
{
- list<sub::Line>::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 ();
+ auto b = j->blocks.front();
BOOST_CHECK_EQUAL (b.font.get(), "theFont");
BOOST_CHECK_EQUAL (b.italic, true);
BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
BOOST_CHECK_EQUAL (i->fade_down.get(), sub::Time::from_hms (0, 0, 0, 0));
{
- list<sub::Line>::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 ();
+ auto b = j->blocks.front();
BOOST_CHECK_EQUAL (b.font.get(), "theFont");
BOOST_CHECK_EQUAL (b.italic, false);
BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
BOOST_CHECK_EQUAL (i->fade_down.get(), sub::Time::from_hms (0, 0, 0, 0));
{
- list<sub::Line>::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 ();
+ auto b = j->blocks.front();
BOOST_CHECK_EQUAL (b.font.get(), "theFont");
BOOST_CHECK_EQUAL (b.italic, false);
BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
BOOST_CHECK_EQUAL (i->fade_down.get(), sub::Time::from_hms (0, 0, 0, 0));
{
- list<sub::Line>::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 ();
+ auto b = j->blocks.front();
BOOST_CHECK_EQUAL (b.font.get(), "theFont");
BOOST_CHECK_EQUAL (b.italic, false);
BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
BOOST_CHECK_EQUAL (i->fade_down.get(), sub::Time::from_hms (0, 0, 0, 0));
{
- list<sub::Line>::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 ();
+ auto b = j->blocks.front();
BOOST_CHECK_EQUAL (b.font.get(), "theFont");
BOOST_CHECK_EQUAL (b.italic, false);
BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));
BOOST_CHECK_EQUAL (i->fade_down.get(), sub::Time::from_hms (0, 0, 0, 0));
{
- list<sub::Line>::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 ();
+ auto b = j->blocks.front();
BOOST_CHECK_EQUAL (b.font.get(), "theFont");
BOOST_CHECK_EQUAL (b.italic, true);
BOOST_CHECK (b.colour == sub::Colour (1, 1, 1));