Improve handling of image subtitle IDs in XML (DoM bug #1965)

[libdcp.git] / test / smpte_subtitle_test.cc

diff --git a/test/smpte_subtitle_test.cc b/test/smpte_subtitle_test.cc
index 74b29951e9bb9c85490a8ae64739cc420337cfc7..cc6190c2a29571bc6e5b24c57a73ef0a4441ff90 100644 (file)
--- a/test/smpte_subtitle_test.cc
+++ b/test/smpte_subtitle_test.cc
@@ -161,18 +161,6 @@ BOOST_AUTO_TEST_CASE (read_smpte_subtitle_test2)
 }
 
 
-/** And another one featuring image subtitles */
-BOOST_AUTO_TEST_CASE (read_smpte_subtitle_test3)
-{
-       dcp::SMPTESubtitleAsset subs ("test/data/subs.mxf");
-
-       BOOST_REQUIRE_EQUAL (subs.subtitles().size(), 1);
-       auto si = dynamic_pointer_cast<const dcp::SubtitleImage>(subs.subtitles()[0]);
-       BOOST_REQUIRE (si);
-       BOOST_CHECK (si->png_image() == dcp::ArrayData("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)
 {
@@ -456,10 +444,13 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test3)
        c.set_reel_number (1);
        c.set_language (dcp::LanguageTag("en"));
        c.set_content_title_text ("Test");
+       c.set_start_time (dcp::Time());
+
+       boost::filesystem::path const sub_image = "test/data/sub.png";
 
        c.add (
                make_shared<dcp::SubtitleImage>(
-                       dcp::ArrayData ("test/data/sub.png"),
+                       dcp::ArrayData(sub_image),
                        dcp::Time (0, 4,  9, 22, 24),
                        dcp::Time (0, 4, 11, 22, 24),
                        0,
@@ -473,8 +464,23 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test3)
 
        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 */
+       boost::filesystem::path path = "build/test/write_smpte_subtitle_test3";
+       boost::filesystem::create_directories (path);
+       c.write (path / "subs.mxf");
+
+       dcp::SMPTESubtitleAsset read_back (path / "subs.mxf");
+       auto subs = read_back.subtitles ();
+       BOOST_REQUIRE_EQUAL (subs.size(), 1U);
+       auto image = dynamic_pointer_cast<const dcp::SubtitleImage>(subs[0]);
+       BOOST_REQUIRE (image);
+
+       BOOST_CHECK (image->png_image() == dcp::ArrayData(sub_image));
+       BOOST_CHECK (image->in() == dcp::Time(0, 4, 9, 22, 24));
+       BOOST_CHECK (image->out() == dcp::Time(0, 4, 11, 22, 24));
+       BOOST_CHECK_CLOSE (image->h_position(), 0.0, 1);
+       BOOST_CHECK (image->h_align() == dcp::HAlign::CENTER);
+       BOOST_CHECK_CLOSE (image->v_position(), 0.8, 1);
+       BOOST_CHECK (image->v_align() == dcp::VAlign::TOP);
+       BOOST_CHECK (image->fade_up_time() == dcp::Time(0, 0, 0, 0, 24));
+       BOOST_CHECK (image->fade_down_time() == dcp::Time(0, 0, 0, 0, 24));
 }