projects / libdcp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9abc1b1)
Fix tests for changes to subtitle whitespace.
authorCarl Hetherington <cth@carlh.net>
Wed, 9 Nov 2016 16:53:19 +0000 (16:53 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 9 Nov 2016 16:53:19 +0000 (16:53 +0000)
test/test.cc patch | blob | history
test/write_subtitle_test.cc patch | blob | history

diff --git a/test/test.cc b/test/test.cc
index 0b99b4b77f610bbbd2f5407231d7502ece1fdcd0..6df35500dadc1a1c9317bcf99590c8ac6d5e420d 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -55,7 +55,10 @@ check_xml (xmlpp::Element* ref, xmlpp::Element* test, list<string> ignore)
 
        xmlpp::Element::NodeList ref_children = ref->get_children ();
        xmlpp::Element::NodeList test_children = test->get_children ();
-       BOOST_REQUIRE_MESSAGE (ref_children.size () == test_children.size (), "child counts of " << ref->get_name() << " differ");
+       BOOST_REQUIRE_MESSAGE (
+               ref_children.size () == test_children.size (),
+               "child counts of " << ref->get_name() << " differ; ref has " << ref_children.size() << ", test has " << test_children.size()
+               );
 
        xmlpp::Element::NodeList::iterator k = ref_children.begin ();
        xmlpp::Element::NodeList::iterator l = test_children.begin ();
diff --git a/test/write_subtitle_test.cc b/test/write_subtitle_test.cc
index 292a00d579a6f4aa8a848fbfeb727023896ba1d0..02dc5e1e3f406d681d579260e9d6beb312b0ebbe 100644 (file)
--- a/test/write_subtitle_test.cc
+++ b/test/write_subtitle_test.cc
@@ -197,21 +197,21 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test)
 
        check_xml (
                c.xml_as_string (),
-               "<DCSubtitle Version=\"1.0\">\n"
-               "  <SubtitleID>a6c58cff-3e1e-4b38-acec-a42224475ef6</SubtitleID>\n"
-               "  <MovieTitle>Test</MovieTitle>\n"
-               "  <ReelNumber>1</ReelNumber>\n"
-               "  <Language>EN</Language>\n"
-               "  <Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" Id=\"Frutiger\" Italic=\"no\" Script=\"normal\" Size=\"48\" Underlined=\"no\" Weight=\"normal\">\n"
-               "    <Subtitle SpotNumber=\"1\" TimeIn=\"00:04:09:229\" TimeOut=\"00:04:11:229\" FadeUpTime=\"0\" FadeDownTime=\"0\">\n"
-               "      <Text VAlign=\"top\" VPosition=\"80\">Hello world</Text>\n"
-               "    </Subtitle>\n"
-               "  </Font>\n"
-               "  <Font AspectAdjust=\"1.0\" Color=\"FF800040\" Effect=\"border\" EffectColor=\"FF010203\" Italic=\"yes\" Script=\"normal\" Size=\"91\" Underlined=\"yes\" Weight=\"bold\">\n"
-               "    <Subtitle SpotNumber=\"2\" TimeIn=\"05:41:00:218\" TimeOut=\"06:12:15:218\" FadeUpTime=\"930792\" FadeDownTime=\"4591834\">\n"
-               "      <Text VAlign=\"bottom\" VPosition=\"40\">What's going on</Text>\n"
-               "    </Subtitle>\n"
-               "  </Font>\n"
+               "<DCSubtitle Version=\"1.0\">"
+                 "<SubtitleID>a6c58cff-3e1e-4b38-acec-a42224475ef6</SubtitleID>"
+                 "<MovieTitle>Test</MovieTitle>"
+                 "<ReelNumber>1</ReelNumber>"
+                 "<Language>EN</Language>"
+                 "<Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" Id=\"Frutiger\" Italic=\"no\" Script=\"normal\" Size=\"48\" Underlined=\"no\" Weight=\"normal\">"
+                   "<Subtitle SpotNumber=\"1\" TimeIn=\"00:04:09:229\" TimeOut=\"00:04:11:229\" FadeUpTime=\"0\" FadeDownTime=\"0\">"
+                     "<Text VAlign=\"top\" VPosition=\"80\">Hello world</Text>"
+                   "</Subtitle>"
+                 "</Font>"
+                 "<Font AspectAdjust=\"1.0\" Color=\"FF800040\" Effect=\"border\" EffectColor=\"FF010203\" Italic=\"yes\" Script=\"normal\" Size=\"91\" Underlined=\"yes\" Weight=\"bold\">"
+                   "<Subtitle SpotNumber=\"2\" TimeIn=\"05:41:00:218\" TimeOut=\"06:12:15:218\" FadeUpTime=\"930792\" FadeDownTime=\"4591834\">"
+                     "<Text VAlign=\"bottom\" VPosition=\"40\">What's going on</Text>"
+                   "</Subtitle>"
+                 "</Font>"
                "</DCSubtitle>",
                list<string> ()
                );
@@ -278,28 +278,28 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test)
 
        check_xml (
                c.xml_as_string (),
-               "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-               "<dcst:SubtitleReel xmlns:dcst=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">\n"
-               "  <dcst:Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</dcst:Id>\n"
-               "  <dcst:ContentTitleText>Test</dcst:ContentTitleText>\n"
-               "  <dcst:IssueDate>2016-04-01T03:52:00.000+00:00</dcst:IssueDate>\n"
-               "  <dcst:ReelNumber>1</dcst:ReelNumber>\n"
-               "  <dcst:Language>EN</dcst:Language>\n"
-               "  <dcst:EditRate>24 1</dcst:EditRate>\n"
-               "  <dcst:TimeCodeRate>24</dcst:TimeCodeRate>\n"
-               "  <dcst:SubtitleList>\n"
-               "    <dcst:Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" ID=\"Frutiger\" Italic=\"no\" Script=\"normal\" Size=\"48\" Underline=\"no\" Weight=\"normal\">\n"
-               "      <dcst:Subtitle SpotNumber=\"1\" TimeIn=\"00:04:09:22\" TimeOut=\"00:04:11:22\" FadeUpTime=\"00:00:00:00\" FadeDownTime=\"00:00:00:00\">\n"
-               "        <dcst:Text Valign=\"top\" Vposition=\"80\">Hello world</dcst:Text>\n"
-               "      </dcst:Subtitle>\n"
-               "    </dcst:Font>\n"
-               "    <dcst:Font AspectAdjust=\"1.0\" Color=\"FF800040\" Effect=\"border\" EffectColor=\"FF010203\" Italic=\"yes\" Script=\"normal\" Size=\"91\" Underline=\"yes\" Weight=\"bold\">\n"
-               "      <dcst:Subtitle SpotNumber=\"2\" TimeIn=\"05:41:00:21\" TimeOut=\"06:12:15:21\" FadeUpTime=\"01:02:03:04\" FadeDownTime=\"05:06:07:08\">\n"
-               "        <dcst:Text Valign=\"bottom\" Vposition=\"40\" Direction=\"rtl\">What's going on</dcst:Text>\n"
-               "      </dcst:Subtitle>\n"
-               "    </dcst:Font>\n"
-               "  </dcst:SubtitleList>\n"
-               "</dcst:SubtitleReel>\n",
+               "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+               "<dcst:SubtitleReel xmlns:dcst=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">"
+                 "<dcst:Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</dcst:Id>"
+                 "<dcst:ContentTitleText>Test</dcst:ContentTitleText>"
+                 "<dcst:IssueDate>2016-04-01T03:52:00.000+00:00</dcst:IssueDate>"
+                 "<dcst:ReelNumber>1</dcst:ReelNumber>"
+                 "<dcst:Language>EN</dcst:Language>"
+                 "<dcst:EditRate>24 1</dcst:EditRate>"
+                 "<dcst:TimeCodeRate>24</dcst:TimeCodeRate>"
+                 "<dcst:SubtitleList>"
+                   "<dcst:Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" ID=\"Frutiger\" Italic=\"no\" Script=\"normal\" Size=\"48\" Underline=\"no\" Weight=\"normal\">"
+                     "<dcst:Subtitle SpotNumber=\"1\" TimeIn=\"00:04:09:22\" TimeOut=\"00:04:11:22\" FadeUpTime=\"00:00:00:00\" FadeDownTime=\"00:00:00:00\">"
+                       "<dcst:Text Valign=\"top\" Vposition=\"80\">Hello world</dcst:Text>"
+                     "</dcst:Subtitle>"
+                   "</dcst:Font>"
+                   "<dcst:Font AspectAdjust=\"1.0\" Color=\"FF800040\" Effect=\"border\" EffectColor=\"FF010203\" Italic=\"yes\" Script=\"normal\" Size=\"91\" Underline=\"yes\" Weight=\"bold\">"
+                     "<dcst:Subtitle SpotNumber=\"2\" TimeIn=\"05:41:00:21\" TimeOut=\"06:12:15:21\" FadeUpTime=\"01:02:03:04\" FadeDownTime=\"05:06:07:08\">"
+                       "<dcst:Text Valign=\"bottom\" Vposition=\"40\" Direction=\"rtl\">What's going on</dcst:Text>"
+                     "</dcst:Subtitle>"
+                   "</dcst:Font>"
+                 "</dcst:SubtitleList>"
+               "</dcst:SubtitleReel>",
                list<string> ()
                );
 }
@@ -464,31 +464,31 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
        check_xml (
                c.xml_as_string (),
                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-               "<dcst:SubtitleReel xmlns:dcst=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">\n"
-               "  <dcst:Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</dcst:Id>\n"
-               "  <dcst:ContentTitleText>Test</dcst:ContentTitleText>\n"
-               "  <dcst:IssueDate>2016-04-01T03:52:00.000+00:00</dcst:IssueDate>\n"
-               "  <dcst:ReelNumber>1</dcst:ReelNumber>\n"
-               "  <dcst:Language>EN</dcst:Language>\n"
-               "  <dcst:EditRate>24 1</dcst:EditRate>\n"
-               "  <dcst:TimeCodeRate>24</dcst:TimeCodeRate>\n"
-               "  <dcst:SubtitleList>\n"
-               "    <dcst:Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" ID=\"Arial\" Script=\"normal\" Size=\"48\" Underline=\"no\" Weight=\"normal\">\n"
-               "      <dcst:Subtitle SpotNumber=\"1\" TimeIn=\"00:00:01:00\" TimeOut=\"00:00:09:00\" FadeUpTime=\"00:00:00:00\" FadeDownTime=\"00:00:00:00\">\n"
-               "        <dcst:Text Valign=\"top\" Vposition=\"80\">\n"
-               "          <dcst:Font Italic=\"no\">Testing is </dcst:Font>\n"
-               "          <dcst:Font Italic=\"yes\">really</dcst:Font>\n"
-               "          <dcst:Font Italic=\"no\"> fun</dcst:Font>\n"
-               "        </dcst:Text>\n"
-               "        <dcst:Text Valign=\"top\" Vposition=\"90\">\n"
-               "          <dcst:Font Italic=\"no\">This is the </dcst:Font>\n"
-               "          <dcst:Font Italic=\"yes\">second</dcst:Font>\n"
-               "          <dcst:Font Italic=\"no\"> line</dcst:Font>\n"
-               "        </dcst:Text>\n"
-               "      </dcst:Subtitle>\n"
-               "    </dcst:Font>\n"
-               "  </dcst:SubtitleList>\n"
-               "</dcst:SubtitleReel>\n",
+               "<dcst:SubtitleReel xmlns:dcst=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">"
+                 "<dcst:Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</dcst:Id>"
+                 "<dcst:ContentTitleText>Test</dcst:ContentTitleText>"
+                 "<dcst:IssueDate>2016-04-01T03:52:00.000+00:00</dcst:IssueDate>"
+                 "<dcst:ReelNumber>1</dcst:ReelNumber>"
+                 "<dcst:Language>EN</dcst:Language>"
+                 "<dcst:EditRate>24 1</dcst:EditRate>"
+                 "<dcst:TimeCodeRate>24</dcst:TimeCodeRate>"
+                 "<dcst:SubtitleList>"
+                   "<dcst:Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" ID=\"Arial\" Script=\"normal\" Size=\"48\" Underline=\"no\" Weight=\"normal\">"
+                     "<dcst:Subtitle SpotNumber=\"1\" TimeIn=\"00:00:01:00\" TimeOut=\"00:00:09:00\" FadeUpTime=\"00:00:00:00\" FadeDownTime=\"00:00:00:00\">"
+                       "<dcst:Text Valign=\"top\" Vposition=\"80\">"
+                         "<dcst:Font Italic=\"no\">Testing is </dcst:Font>"
+                         "<dcst:Font Italic=\"yes\">really</dcst:Font>"
+                         "<dcst:Font Italic=\"no\"> fun</dcst:Font>"
+                       "</dcst:Text>"
+                       "<dcst:Text Valign=\"top\" Vposition=\"90\">"
+                         "<dcst:Font Italic=\"no\">This is the </dcst:Font>"
+                         "<dcst:Font Italic=\"yes\">second</dcst:Font>"
+                         "<dcst:Font Italic=\"no\"> line</dcst:Font>"
+                       "</dcst:Text>"
+                     "</dcst:Subtitle>"
+                   "</dcst:Font>"
+                 "</dcst:SubtitleList>"
+               "</dcst:SubtitleReel>",
                list<string> ()
                );
 }
C++ library for handling digital cinema packages (DCPs).