From: Carl Hetherington <cth@carlh.net>
Date: Mon, 27 Feb 2023 09:46:36 +0000 (+0100)
Subject: Fix tests again on Windows.
X-Git-Tag: v1.8.63
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;ds=inline;h=refs%2Ftags%2Fv1.8.63;p=libdcp.git

Fix tests again on Windows.
---

diff --git a/test/data/2007.mxf b/test/data/2007.mxf
index a6e68bf7..be085a9c 100644
Binary files a/test/data/2007.mxf and b/test/data/2007.mxf differ
diff --git a/test/data/2010.mxf b/test/data/2010.mxf
index 82c64c19..60f20108 100644
Binary files a/test/data/2010.mxf and b/test/data/2010.mxf differ
diff --git a/test/smpte_subtitle_test.cc b/test/smpte_subtitle_test.cc
index e5cdfa23..b271b02c 100644
--- a/test/smpte_subtitle_test.cc
+++ b/test/smpte_subtitle_test.cc
@@ -719,27 +719,20 @@ BOOST_AUTO_TEST_CASE(smpte_subtitle_standard_written_correctly)
 	boost::filesystem::remove_all(out);
 	boost::filesystem::create_directories(out);
 
-	dcp::MXFMetadata metadata;
-	/* Pin this so tests don't fail on newer version */
-	metadata.product_version = "1.8.59";
-
 	dcp::SMPTESubtitleAsset test_2014;
-	test_2014.set_metadata(metadata);
 	test_2014.set_issue_date(dcp::LocalTime("2020-01-01T14:00:00"));
 	test_2014.write(out / "2014.mxf");
-	check_file(ref / "2014.mxf", out / "2014.mxf");
+	BOOST_CHECK(dcp::SMPTESubtitleAsset(ref / "2014.mxf").raw_xml() == dcp::SMPTESubtitleAsset(out / "2014.mxf").raw_xml());
 
 	dcp::SMPTESubtitleAsset test_2010(dcp::SubtitleStandard::SMPTE_2010);
-	test_2010.set_metadata(metadata);
 	test_2010.set_issue_date(dcp::LocalTime("2020-01-01T14:00:00"));
 	test_2010.write(out / "2010.mxf");
-	check_file(ref / "2010.mxf", out / "2010.mxf");
+	BOOST_CHECK(dcp::SMPTESubtitleAsset(ref / "2010.mxf").raw_xml() == dcp::SMPTESubtitleAsset(out / "2010.mxf").raw_xml());
 
 	dcp::SMPTESubtitleAsset test_2007(dcp::SubtitleStandard::SMPTE_2007);
-	test_2007.set_metadata(metadata);
 	test_2007.set_issue_date(dcp::LocalTime("2020-01-01T14:00:00"));
 	test_2007.write(out / "2007.mxf");
-	check_file(ref / "2007.mxf", out / "2007.mxf");
+	BOOST_CHECK(dcp::SMPTESubtitleAsset(ref / "2007.mxf").raw_xml() == dcp::SMPTESubtitleAsset(out / "2007.mxf").raw_xml());
 }