summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-07-12 15:37:13 +0200
committerCarl Hetherington <cth@carlh.net>2020-07-12 15:37:13 +0200
commit09d3fd999cd9dae6e5b9b3db69af3452ab0fadf2 (patch)
tree910a774ab382c02bdc6c5b9f8da5113ddbca34a9
parent2a4723250dd574a53775864034578120ddce5ffe (diff)
Fix up some tests.
l---------test/ref/write_interop_subtitle_test3/pkl.xml2
-rw-r--r--test/ref/write_interop_subtitle_test3/pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml (renamed from test/ref/write_interop_subtitle_test3/pkl_f5aab304-8145-44e3-a265-aa8d8812d8a2.xml)12
-rw-r--r--test/write_subtitle_test.cc5
3 files changed, 10 insertions, 9 deletions
diff --git a/test/ref/write_interop_subtitle_test3/pkl.xml b/test/ref/write_interop_subtitle_test3/pkl.xml
index c78f2adf..3f38ee57 120000
--- a/test/ref/write_interop_subtitle_test3/pkl.xml
+++ b/test/ref/write_interop_subtitle_test3/pkl.xml
@@ -1 +1 @@
-pkl_f5aab304-8145-44e3-a265-aa8d8812d8a2.xml \ No newline at end of file
+pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml \ No newline at end of file
diff --git a/test/ref/write_interop_subtitle_test3/pkl_f5aab304-8145-44e3-a265-aa8d8812d8a2.xml b/test/ref/write_interop_subtitle_test3/pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml
index b8107a1a..368c9f24 100644
--- a/test/ref/write_interop_subtitle_test3/pkl_f5aab304-8145-44e3-a265-aa8d8812d8a2.xml
+++ b/test/ref/write_interop_subtitle_test3/pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml
@@ -1,27 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<PackingList xmlns="http://www.digicine.com/PROTO-ASDCP-PKL-20040311#">
- <Id>urn:uuid:f5aab304-8145-44e3-a265-aa8d8812d8a2</Id>
+ <Id>urn:uuid:e94b8a0d-27f7-408a-af16-78d3df419a91</Id>
<AnnotationText>Created by libdcp</AnnotationText>
<IssueDate>2018-09-02T04:45:18+00:00</IssueDate>
<Issuer>libdcp</Issuer>
<Creator>libdcp</Creator>
<AssetList>
<Asset>
- <Id>urn:uuid:f28b567b-3b9a-417a-aee4-6fc1a2c6a3af</Id>
- <AnnotationText>f28b567b-3b9a-417a-aee4-6fc1a2c6a3af</AnnotationText>
- <Hash>st3oqERkPDwHSRDC+WPEkgaRKwM=</Hash>
+ <Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id>
+ <AnnotationText>46c3eb45-15e5-47d6-8684-d8641e4dc516</AnnotationText>
+ <Hash>P2gjv5LMQFMu0BH4RLAfFVVXNRA=</Hash>
<Size>1105</Size>
<Type>text/xml;asdcpKind=CPL</Type>
</Asset>
<Asset>
<Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</Id>
<AnnotationText>a6c58cff-3e1e-4b38-acec-a42224475ef6</AnnotationText>
- <Hash>rl+eBdjvZ0xaaaABGCpf6cm9G/Q=</Hash>
+ <Hash>cVnFjMLTQnSIAlIzJpNB/p7B230=</Hash>
<Size>414</Size>
<Type>text/xml;asdcpKind=Subtitle</Type>
</Asset>
<Asset>
- <Id>urn:uuid:ef5c6baa-be2d-4f86-9f15-b1acc792ee8b</Id>
+ <Id>urn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71</Id>
<Hash>w0Xc4TUYpao08I0yPSDfFkaEwdg=</Hash>
<Size>44935</Size>
<Type>image/png</Type>
diff --git a/test/write_subtitle_test.cc b/test/write_subtitle_test.cc
index 074068f4..30220420 100644
--- a/test/write_subtitle_test.cc
+++ b/test/write_subtitle_test.cc
@@ -354,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");
@@ -380,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"),
@@ -390,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_e94b8a0d-27f7-408a-af16-78d3df419a91.xml"),
list<string>()
);
}