Use the <Id> read in when the Reel was created from XML (if appropriate)

[libdcp.git] / test / write_subtitle_test.cc

diff --git a/test/write_subtitle_test.cc b/test/write_subtitle_test.cc
index c005a58caadfc15e77af0359d5df73764987a841..dd51d91928d3c99bb43d5886f1fc08c346eab07b 100644 (file)
--- a/test/write_subtitle_test.cc
+++ b/test/write_subtitle_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -15,6 +15,20 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 #include "interop_subtitle_asset.h"
@@ -316,6 +330,8 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test2)
 /* Write some subtitle content as Interop XML using bitmaps and check that it is right */
 BOOST_AUTO_TEST_CASE (write_interop_subtitle_test3)
 {
+       RNGFixer fix;
+
        shared_ptr<dcp::InteropSubtitleAsset> c (new dcp::InteropSubtitleAsset());
        c->set_reel_number ("1");
        c->set_language ("EN");
@@ -338,6 +354,7 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test3)
                );
 
        c->_id = "a6c58cff-3e1e-4b38-acec-a42224475ef6";
+       boost::filesystem::remove_all ("build/test/write_interop_subtitle_test3");
        boost::filesystem::create_directories ("build/test/write_interop_subtitle_test3");
        c->write ("build/test/write_interop_subtitle_test3/subs.xml");
 
@@ -364,7 +381,7 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test3)
                dcp::file_to_string("build/test/write_interop_subtitle_test3/subs.xml"),
                list<string>()
                );
-       check_file ("build/test/write_interop_subtitle_test3/ef5c6baa-be2d-4f86-9f15-b1acc792ee8b.png", "test/data/sub.png");
+       check_file ("build/test/write_interop_subtitle_test3/d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png", "test/data/sub.png");
 
        check_xml (
                dcp::file_to_string("test/ref/write_interop_subtitle_test3/ASSETMAP"),
@@ -374,7 +391,7 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test3)
 
        check_xml (
                dcp::file_to_string("test/ref/write_interop_subtitle_test3/pkl.xml"),
-               dcp::file_to_string("build/test/write_interop_subtitle_test3/pkl_f5aab304-8145-44e3-a265-aa8d8812d8a2.xml"),
+               dcp::file_to_string("build/test/write_interop_subtitle_test3/pkl_6a9e31a6-50a4-4ecb-8683-fa667848470a.xml"),
                list<string>()
                );
 }