Bump libdcp for new equality option.

[libsub.git] / test / dcp_reader_test.cc

diff --git a/test/dcp_reader_test.cc b/test/dcp_reader_test.cc
index a5ec9750e4b9a00583fb0ba88da54e11a89c50e9..9105c283cb588e10e8fcc61a3d5a73a8a10a12b1 100644 (file)
--- a/test/dcp_reader_test.cc
+++ b/test/dcp_reader_test.cc
@@ -17,31 +17,29 @@
 
 */
 
-#include "interop_dcp_reader.h"
+#include "dcp_reader.h"
 #include "collect.h"
 #include <boost/test/unit_test.hpp>
-#include <fstream>
+#include <boost/optional/optional_io.hpp>
 
-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 ();
@@ -67,10 +65,10 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test1)
        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));
@@ -107,10 +105,10 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test1)
        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));
@@ -133,10 +131,10 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test1)
        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));
@@ -155,10 +153,10 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test1)
 /* 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));
@@ -166,10 +164,10 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
        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));
@@ -179,7 +177,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
                BOOST_CHECK_EQUAL (b.text, "At afternoon tea with John Peel");
                BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
                BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
-               
+
                ++j;
                BOOST_REQUIRE (j != i->lines.end ());
                BOOST_REQUIRE_EQUAL (j->blocks.size(), 1);
@@ -197,7 +195,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
                ++j;
                BOOST_CHECK (j == i->lines.end ());
        }
-               
+
        ++i;
        BOOST_REQUIRE (i != subs.end ());
        BOOST_CHECK_EQUAL (i->from, sub::Time::from_hms (0, 0, 50, 42 * 4));
@@ -206,10 +204,10 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
        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));
@@ -246,10 +244,10 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
        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));
@@ -259,7 +257,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
                BOOST_CHECK_EQUAL (b.text, "At home it depends how I feel.\"");
                BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
                BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
-               
+
                ++j;
                BOOST_REQUIRE (j != i->lines.end ());
                BOOST_REQUIRE_EQUAL (j->blocks.size(), 1);
@@ -288,12 +286,12 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
        BOOST_CHECK_EQUAL (i->to, sub::Time::from_hms (0, 1, 16, 42 * 4));
        BOOST_CHECK_EQUAL (i->fade_up.get(), sub::Time::from_hms (0, 0, 0, 0));
        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));
@@ -303,7 +301,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
                BOOST_CHECK_EQUAL (b.text, "With the legendary Miss Enid Blyton");
                BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
                BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
-               
+
                ++j;
                BOOST_REQUIRE (j != i->lines.end ());
                BOOST_REQUIRE_EQUAL (j->blocks.size(), 1);
@@ -327,13 +325,13 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
        BOOST_CHECK_EQUAL (i->from, sub::Time::from_hms (0, 1, 20, 219 * 4));
        BOOST_CHECK_EQUAL (i->to, sub::Time::from_hms (0, 1, 22, 73 * 4));
        BOOST_CHECK_EQUAL (i->fade_up.get(), sub::Time::from_hms (0, 0, 0, 0));
-       BOOST_CHECK_EQUAL (i->fade_down.get(), sub::Time::from_hms (0, 0, 0, 0));       
-       
+       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));
@@ -343,7 +341,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
                BOOST_CHECK_EQUAL (b.text, "and I'll show you my body\"");
                BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
                BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
-               
+
                ++j;
                BOOST_REQUIRE (j != i->lines.end ());
                BOOST_REQUIRE_EQUAL (j->blocks.size(), 1);
@@ -368,12 +366,12 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
        BOOST_CHECK_EQUAL (i->to, sub::Time::from_hms (0, 1, 28, 208 * 4));
        BOOST_CHECK_EQUAL (i->fade_up.get(), sub::Time::from_hms (0, 0, 0, 0));
        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));
@@ -383,7 +381,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
                BOOST_CHECK_EQUAL (b.text, "That curious creature the Sphinx");
                BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
                BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
-               
+
                ++j;
                BOOST_REQUIRE (j != i->lines.end ());
                BOOST_REQUIRE_EQUAL (j->blocks.size(), 1);
@@ -410,10 +408,10 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
        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));
@@ -423,7 +421,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
                BOOST_CHECK_EQUAL (b.text, "It sits there and smirks");
                BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
                BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
-               
+
                ++j;
                BOOST_REQUIRE (j != i->lines.end ());
                BOOST_REQUIRE_EQUAL (j->blocks.size(), 1);
@@ -448,12 +446,12 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
        BOOST_CHECK_EQUAL (i->to, sub::Time::from_hms (0, 1, 47, 94 * 4));
        BOOST_CHECK_EQUAL (i->fade_up.get(), sub::Time::from_hms (0, 0, 0, 0));
        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));
@@ -463,7 +461,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
                BOOST_CHECK_EQUAL (b.text, "Then when you're not looking, it winks.");
                BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
                BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
-               
+
                ++j;
                BOOST_REQUIRE (j != i->lines.end ());
                BOOST_REQUIRE_EQUAL (j->blocks.size(), 1);
@@ -488,12 +486,12 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
        BOOST_CHECK_EQUAL (i->to, sub::Time::from_hms (0, 1, 48, 167 * 4));
        BOOST_CHECK_EQUAL (i->fade_up.get(), sub::Time::from_hms (0, 0, 0, 0));
        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));
@@ -503,7 +501,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
                BOOST_CHECK_EQUAL (b.text, "Out mooning, at night, on the ledge");
                BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
                BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
-               
+
                ++j;
                BOOST_REQUIRE (j != i->lines.end ());
                BOOST_REQUIRE_EQUAL (j->blocks.size(), 1);
@@ -521,19 +519,19 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
                ++j;
                BOOST_CHECK (j == i->lines.end ());
        }
-               
+
        ++i;
        BOOST_REQUIRE (i != subs.end ());
        BOOST_CHECK_EQUAL (i->from, sub::Time::from_hms (0, 1, 53, 21 * 4));
        BOOST_CHECK_EQUAL (i->to, sub::Time::from_hms (0, 1, 56, 10 * 4));
        BOOST_CHECK_EQUAL (i->fade_up.get(), sub::Time::from_hms (0, 0, 0, 0));
        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));
@@ -543,7 +541,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
                BOOST_CHECK_EQUAL (b.text, "Is the maestro, James Brown");
                BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
                BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
-               
+
                ++j;
                BOOST_REQUIRE (j != i->lines.end ());
                BOOST_REQUIRE_EQUAL (j->blocks.size(), 1);
@@ -561,19 +559,19 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
                ++j;
                BOOST_CHECK (j == i->lines.end ());
        }
-       
+
        ++i;
        BOOST_REQUIRE (i != subs.end ());
        BOOST_CHECK_EQUAL (i->from, sub::Time::from_hms (0, 2, 5, 208 * 4));
        BOOST_CHECK_EQUAL (i->to, sub::Time::from_hms (0, 2, 7, 31 * 4));
        BOOST_CHECK_EQUAL (i->fade_up.get(), sub::Time::from_hms (0, 0, 0, 0));
        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));
@@ -583,7 +581,7 @@ BOOST_AUTO_TEST_CASE (dcp_reader_test2)
                BOOST_CHECK_EQUAL (b.text, "HELLO");
                BOOST_CHECK_EQUAL (b.effect, sub::BORDER);
                BOOST_CHECK (b.effect_colour.get() == sub::Colour (0, 0, 0));
-               
+
                ++j;
                BOOST_REQUIRE (j != i->lines.end ());
                BOOST_REQUIRE_EQUAL (j->blocks.size(), 1);