Move some tests from write_subtitle_test to smpte_subtitle_test.
authorCarl Hetherington <cth@carlh.net>
Fri, 16 Apr 2021 15:45:59 +0000 (17:45 +0200)
committerCarl Hetherington <cth@carlh.net>
Fri, 16 Apr 2021 15:46:38 +0000 (17:46 +0200)
Cherry-picked from 9e3f8bfe9e274865590d49ad1e59e82f7894a12a in master.

test/smpte_subtitle_test.cc
test/write_subtitle_test.cc

index e81a6313d59b4f5ea79f34d7c6e23805ab4d6972..b8232e9fad334cb3cb89be4405cfd87761454210 100644 (file)
@@ -41,7 +41,9 @@
 #include <boost/test/unit_test.hpp>
 
 
+using std::list;
 using std::string;
+using std::vector;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 using boost::shared_ptr;
@@ -170,3 +172,329 @@ BOOST_AUTO_TEST_CASE (read_smpte_subtitle_test3)
        BOOST_REQUIRE (si);
        BOOST_CHECK (si->png_image() == dcp::Data("test/data/sub.png"));
 }
+
+
+/* Write some subtitle content as SMPTE XML and check that it is right */
+BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test)
+{
+       dcp::SMPTESubtitleAsset c;
+       c.set_reel_number (1);
+       c.set_language ("en");
+       c.set_content_title_text ("Test");
+       c.set_issue_date (dcp::LocalTime ("2016-04-01T03:52:00+00:00"));
+
+       c.add (
+               shared_ptr<dcp::SubtitleString> (
+                       new dcp::SubtitleString(
+                               string ("Frutiger"),
+                               false,
+                               false,
+                               false,
+                               dcp::Colour (255, 255, 255),
+                               48,
+                               1.0,
+                               dcp::Time (0, 4,  9, 22, 24),
+                               dcp::Time (0, 4, 11, 22, 24),
+                               0,
+                               dcp::HALIGN_CENTER,
+                               0.8,
+                               dcp::VALIGN_TOP,
+                               dcp::DIRECTION_LTR,
+                               "Hello world",
+                               dcp::NONE,
+                               dcp::Colour (0, 0, 0),
+                               dcp::Time (0, 0, 0, 0, 24),
+                               dcp::Time (0, 0, 0, 0, 24)
+                               )
+                       )
+               );
+
+       c.add (
+               shared_ptr<dcp::SubtitleString>(
+                       new dcp::SubtitleString(
+                               boost::optional<string> (),
+                               true,
+                               true,
+                               true,
+                               dcp::Colour (128, 0, 64),
+                               91,
+                               1.0,
+                               dcp::Time (5, 41,  0, 21, 24),
+                               dcp::Time (6, 12, 15, 21, 24),
+                               0,
+                               dcp::HALIGN_CENTER,
+                               0.4,
+                               dcp::VALIGN_BOTTOM,
+                               dcp::DIRECTION_RTL,
+                               "What's going on",
+                               dcp::BORDER,
+                               dcp::Colour (1, 2, 3),
+                               dcp::Time (1, 2, 3, 4, 24),
+                               dcp::Time (5, 6, 7, 8, 24)
+                               )
+                       )
+               );
+
+       c._xml_id = "a6c58cff-3e1e-4b38-acec-a42224475ef6";
+
+       check_xml (
+               "<?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>",
+               c.xml_as_string (),
+               list<string>()
+               );
+}
+
+/* Write some subtitle content as SMPTE XML and check that it is right.
+   This includes in-line font changes.
+*/
+BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
+{
+       dcp::SMPTESubtitleAsset c;
+       c.set_reel_number (1);
+       c.set_language ("en");
+       c.set_content_title_text ("Test");
+       c.set_issue_date (dcp::LocalTime ("2016-04-01T03:52:00+00:00"));
+
+       c.add (
+               shared_ptr<dcp::SubtitleString>(
+                       new dcp::SubtitleString(
+                               string ("Arial"),
+                               false,
+                               false,
+                               false,
+                               dcp::Colour (255, 255, 255),
+                               48,
+                               1.0,
+                               dcp::Time (0, 0, 1, 0, 24),
+                               dcp::Time (0, 0, 9, 0, 24),
+                               0,
+                               dcp::HALIGN_CENTER,
+                               0.8,
+                               dcp::VALIGN_TOP,
+                               dcp::DIRECTION_LTR,
+                               "Testing is ",
+                               dcp::NONE,
+                               dcp::Colour (0, 0, 0),
+                               dcp::Time (0, 0, 0, 0, 24),
+                               dcp::Time (0, 0, 0, 0, 24)
+                               )
+                       )
+               );
+
+       c.add (
+               shared_ptr<dcp::SubtitleString>(
+                       new dcp::SubtitleString(
+                               string ("Arial"),
+                               true,
+                               false,
+                               false,
+                               dcp::Colour (255, 255, 255),
+                               48,
+                               1.0,
+                               dcp::Time (0, 0, 1, 0, 24),
+                               dcp::Time (0, 0, 9, 0, 24),
+                               0,
+                               dcp::HALIGN_CENTER,
+                               0.8,
+                               dcp::VALIGN_TOP,
+                               dcp::DIRECTION_LTR,
+                               "really",
+                               dcp::NONE,
+                               dcp::Colour (0, 0, 0),
+                               dcp::Time (0, 0, 0, 0, 24),
+                               dcp::Time (0, 0, 0, 0, 24)
+                               )
+                       )
+               );
+
+       c.add (
+               shared_ptr<dcp::SubtitleString>(
+                       new dcp::SubtitleString(
+                               string ("Arial"),
+                               false,
+                               false,
+                               false,
+                               dcp::Colour (255, 255, 255),
+                               48,
+                               1.0,
+                               dcp::Time (0, 0, 1, 0, 24),
+                               dcp::Time (0, 0, 9, 0, 24),
+                               0,
+                               dcp::HALIGN_CENTER,
+                               0.8,
+                               dcp::VALIGN_TOP,
+                               dcp::DIRECTION_LTR,
+                               " fun",
+                               dcp::NONE,
+                               dcp::Colour (0, 0, 0),
+                               dcp::Time (0, 0, 0, 0, 24),
+                               dcp::Time (0, 0, 0, 0, 24)
+                               )
+                       )
+               );
+
+       c.add (
+               shared_ptr<dcp::SubtitleString>(
+                       new dcp::SubtitleString(
+                               string ("Arial"),
+                               false,
+                               false,
+                               false,
+                               dcp::Colour (255, 255, 255),
+                               48,
+                               1.0,
+                               dcp::Time (0, 0, 1, 0, 24),
+                               dcp::Time (0, 0, 9, 0, 24),
+                               0,
+                               dcp::HALIGN_CENTER,
+                               0.9,
+                               dcp::VALIGN_TOP,
+                               dcp::DIRECTION_LTR,
+                               "This is the ",
+                               dcp::NONE,
+                               dcp::Colour (0, 0, 0),
+                               dcp::Time (0, 0, 0, 0, 24),
+                               dcp::Time (0, 0, 0, 0, 24)
+                               )
+                       )
+               );
+
+       c.add (
+               shared_ptr<dcp::SubtitleString>(
+                       new dcp::SubtitleString(
+                               string ("Arial"),
+                               true,
+                               false,
+                               false,
+                               dcp::Colour (255, 255, 255),
+                               48,
+                               1.0,
+                               dcp::Time (0, 0, 1, 0, 24),
+                               dcp::Time (0, 0, 9, 0, 24),
+                               0,
+                               dcp::HALIGN_CENTER,
+                               0.9,
+                               dcp::VALIGN_TOP,
+                               dcp::DIRECTION_LTR,
+                               "second",
+                               dcp::NONE,
+                               dcp::Colour (0, 0, 0),
+                               dcp::Time (0, 0, 0, 0, 24),
+                               dcp::Time (0, 0, 0, 0, 24)
+                               )
+                       )
+               );
+
+       c.add (
+               shared_ptr<dcp::SubtitleString>(
+                       new dcp::SubtitleString(
+                               string ("Arial"),
+                               false,
+                               false,
+                               false,
+                               dcp::Colour (255, 255, 255),
+                               48,
+                               1.0,
+                               dcp::Time (0, 0, 1, 0, 24),
+                               dcp::Time (0, 0, 9, 0, 24),
+                               0,
+                               dcp::HALIGN_CENTER,
+                               0.9,
+                               dcp::VALIGN_TOP,
+                               dcp::DIRECTION_LTR,
+                               " line",
+                               dcp::NONE,
+                               dcp::Colour (0, 0, 0),
+                               dcp::Time (0, 0, 0, 0, 24),
+                               dcp::Time (0, 0, 0, 0, 24)
+                               )
+                       )
+               );
+
+       c._xml_id = "a6c58cff-3e1e-4b38-acec-a42224475ef6";
+
+       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\">"
+                 "<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>()
+               );
+}
+
+/* Write some subtitle content as SMPTE using bitmaps and check that it is right */
+BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test3)
+{
+       dcp::SMPTESubtitleAsset c;
+       c.set_reel_number (1);
+       c.set_language ("en");
+       c.set_content_title_text ("Test");
+
+       c.add (
+               shared_ptr<dcp::SubtitleImage>(
+                       new dcp::SubtitleImage(
+                               dcp::Data ("test/data/sub.png"),
+                               dcp::Time (0, 4,  9, 22, 24),
+                               dcp::Time (0, 4, 11, 22, 24),
+                               0,
+                               dcp::HALIGN_CENTER,
+                               0.8,
+                               dcp::VALIGN_TOP,
+                               dcp::Time (0, 0, 0, 0, 24),
+                               dcp::Time (0, 0, 0, 0, 24)
+                               )
+                       )
+             );
+
+       c._id = "a6c58cff-3e1e-4b38-acec-a42224475ef6";
+
+       boost::filesystem::create_directories ("build/test/write_smpte_subtitle_test3");
+       c.write ("build/test/write_smpte_subtitle_test3/subs.mxf");
+
+       /* XXX: check this result when we can read them back in again */
+}
+
index c005a58caadfc15e77af0359d5df73764987a841..c0cbcad05cb679f00e099bfbe8d22510eafdf59a 100644 (file)
@@ -379,326 +379,3 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test3)
                );
 }
 
-/* Write some subtitle content as SMPTE XML and check that it is right */
-BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test)
-{
-       dcp::SMPTESubtitleAsset c;
-       c.set_reel_number (1);
-       c.set_language ("EN");
-       c.set_content_title_text ("Test");
-       c.set_issue_date (dcp::LocalTime ("2016-04-01T03:52:00+00:00"));
-
-       c.add (
-               shared_ptr<dcp::Subtitle> (
-                       new dcp::SubtitleString (
-                               string ("Frutiger"),
-                               false,
-                               false,
-                               false,
-                               dcp::Colour (255, 255, 255),
-                               48,
-                               1.0,
-                               dcp::Time (0, 4,  9, 22, 24),
-                               dcp::Time (0, 4, 11, 22, 24),
-                               0,
-                               dcp::HALIGN_CENTER,
-                               0.8,
-                               dcp::VALIGN_TOP,
-                               dcp::DIRECTION_LTR,
-                               "Hello world",
-                               dcp::NONE,
-                               dcp::Colour (0, 0, 0),
-                               dcp::Time (0, 0, 0, 0, 24),
-                               dcp::Time (0, 0, 0, 0, 24)
-                               )
-                       )
-               );
-
-       c.add (
-               shared_ptr<dcp::Subtitle> (
-                       new dcp::SubtitleString (
-                               boost::optional<string> (),
-                               true,
-                               true,
-                               true,
-                               dcp::Colour (128, 0, 64),
-                               91,
-                               1.0,
-                               dcp::Time (5, 41,  0, 21, 24),
-                               dcp::Time (6, 12, 15, 21, 24),
-                               0,
-                               dcp::HALIGN_CENTER,
-                               0.4,
-                               dcp::VALIGN_BOTTOM,
-                               dcp::DIRECTION_RTL,
-                               "What's going on",
-                               dcp::BORDER,
-                               dcp::Colour (1, 2, 3),
-                               dcp::Time (1, 2, 3, 4, 24),
-                               dcp::Time (5, 6, 7, 8, 24)
-                               )
-                       )
-               );
-
-       c._xml_id = "a6c58cff-3e1e-4b38-acec-a42224475ef6";
-
-       check_xml (
-               "<?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>",
-               c.xml_as_string (),
-               list<string> ()
-               );
-}
-
-/* Write some subtitle content as SMPTE XML and check that it is right.
-   This includes in-line font changes.
-*/
-BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
-{
-       dcp::SMPTESubtitleAsset c;
-       c.set_reel_number (1);
-       c.set_language ("EN");
-       c.set_content_title_text ("Test");
-       c.set_issue_date (dcp::LocalTime ("2016-04-01T03:52:00+00:00"));
-
-       c.add (
-               shared_ptr<dcp::Subtitle> (
-                       new dcp::SubtitleString (
-                               string ("Arial"),
-                               false,
-                               false,
-                               false,
-                               dcp::Colour (255, 255, 255),
-                               48,
-                               1.0,
-                               dcp::Time (0, 0, 1, 0, 24),
-                               dcp::Time (0, 0, 9, 0, 24),
-                               0,
-                               dcp::HALIGN_CENTER,
-                               0.8,
-                               dcp::VALIGN_TOP,
-                               dcp::DIRECTION_LTR,
-                               "Testing is ",
-                               dcp::NONE,
-                               dcp::Colour (0, 0, 0),
-                               dcp::Time (0, 0, 0, 0, 24),
-                               dcp::Time (0, 0, 0, 0, 24)
-                               )
-                       )
-               );
-
-       c.add (
-               shared_ptr<dcp::Subtitle> (
-                       new dcp::SubtitleString (
-                               string ("Arial"),
-                               true,
-                               false,
-                               false,
-                               dcp::Colour (255, 255, 255),
-                               48,
-                               1.0,
-                               dcp::Time (0, 0, 1, 0, 24),
-                               dcp::Time (0, 0, 9, 0, 24),
-                               0,
-                               dcp::HALIGN_CENTER,
-                               0.8,
-                               dcp::VALIGN_TOP,
-                               dcp::DIRECTION_LTR,
-                               "really",
-                               dcp::NONE,
-                               dcp::Colour (0, 0, 0),
-                               dcp::Time (0, 0, 0, 0, 24),
-                               dcp::Time (0, 0, 0, 0, 24)
-                               )
-                       )
-               );
-
-       c.add (
-               shared_ptr<dcp::Subtitle> (
-                       new dcp::SubtitleString (
-                               string ("Arial"),
-                               false,
-                               false,
-                               false,
-                               dcp::Colour (255, 255, 255),
-                               48,
-                               1.0,
-                               dcp::Time (0, 0, 1, 0, 24),
-                               dcp::Time (0, 0, 9, 0, 24),
-                               0,
-                               dcp::HALIGN_CENTER,
-                               0.8,
-                               dcp::VALIGN_TOP,
-                               dcp::DIRECTION_LTR,
-                               " fun",
-                               dcp::NONE,
-                               dcp::Colour (0, 0, 0),
-                               dcp::Time (0, 0, 0, 0, 24),
-                               dcp::Time (0, 0, 0, 0, 24)
-                               )
-                       )
-               );
-
-       c.add (
-               shared_ptr<dcp::Subtitle> (
-                       new dcp::SubtitleString (
-                               string ("Arial"),
-                               false,
-                               false,
-                               false,
-                               dcp::Colour (255, 255, 255),
-                               48,
-                               1.0,
-                               dcp::Time (0, 0, 1, 0, 24),
-                               dcp::Time (0, 0, 9, 0, 24),
-                               0,
-                               dcp::HALIGN_CENTER,
-                               0.9,
-                               dcp::VALIGN_TOP,
-                               dcp::DIRECTION_LTR,
-                               "This is the ",
-                               dcp::NONE,
-                               dcp::Colour (0, 0, 0),
-                               dcp::Time (0, 0, 0, 0, 24),
-                               dcp::Time (0, 0, 0, 0, 24)
-                               )
-                       )
-               );
-
-       c.add (
-               shared_ptr<dcp::Subtitle> (
-                       new dcp::SubtitleString (
-                               string ("Arial"),
-                               true,
-                               false,
-                               false,
-                               dcp::Colour (255, 255, 255),
-                               48,
-                               1.0,
-                               dcp::Time (0, 0, 1, 0, 24),
-                               dcp::Time (0, 0, 9, 0, 24),
-                               0,
-                               dcp::HALIGN_CENTER,
-                               0.9,
-                               dcp::VALIGN_TOP,
-                               dcp::DIRECTION_LTR,
-                               "second",
-                               dcp::NONE,
-                               dcp::Colour (0, 0, 0),
-                               dcp::Time (0, 0, 0, 0, 24),
-                               dcp::Time (0, 0, 0, 0, 24)
-                               )
-                       )
-               );
-
-       c.add (
-               shared_ptr<dcp::Subtitle> (
-                       new dcp::SubtitleString (
-                               string ("Arial"),
-                               false,
-                               false,
-                               false,
-                               dcp::Colour (255, 255, 255),
-                               48,
-                               1.0,
-                               dcp::Time (0, 0, 1, 0, 24),
-                               dcp::Time (0, 0, 9, 0, 24),
-                               0,
-                               dcp::HALIGN_CENTER,
-                               0.9,
-                               dcp::VALIGN_TOP,
-                               dcp::DIRECTION_LTR,
-                               " line",
-                               dcp::NONE,
-                               dcp::Colour (0, 0, 0),
-                               dcp::Time (0, 0, 0, 0, 24),
-                               dcp::Time (0, 0, 0, 0, 24)
-                               )
-                       )
-               );
-
-       c._xml_id = "a6c58cff-3e1e-4b38-acec-a42224475ef6";
-
-       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\">"
-                 "<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> ()
-               );
-}
-
-/* Write some subtitle content as SMPTE using bitmaps and check that it is right */
-BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test3)
-{
-       dcp::SMPTESubtitleAsset c;
-       c.set_reel_number (1);
-       c.set_language ("EN");
-       c.set_content_title_text ("Test");
-
-       c.add (
-               shared_ptr<dcp::Subtitle> (
-                       new dcp::SubtitleImage (
-                               dcp::Data ("test/data/sub.png"),
-                               dcp::Time (0, 4,  9, 22, 24),
-                               dcp::Time (0, 4, 11, 22, 24),
-                               0,
-                               dcp::HALIGN_CENTER,
-                               0.8,
-                               dcp::VALIGN_TOP,
-                               dcp::Time (0, 0, 0, 0, 24),
-                               dcp::Time (0, 0, 0, 0, 24)
-                               )
-                       )
-               );
-
-       c._id = "a6c58cff-3e1e-4b38-acec-a42224475ef6";
-
-       boost::filesystem::create_directories ("build/test/write_smpte_subtitle_test3");
-       c.write ("build/test/write_smpte_subtitle_test3/subs.mxf");
-
-       /* XXX: check this result when we can read them back in again */
-}