From 784020963f518aaba48b18b3fcff55d5c28a1f28 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 2 May 2022 17:49:32 +0200
Subject: Make some tests repeatable across platforms.

---
 test/ref/write_interop_subtitle_test3/ASSETMAP     |  14 +++++-----
 .../cpl_46c3eb45-15e5-47d6-8684-d8641e4dc516.xml   |  31 ---------------------
 .../cpl_5407b210-4441-4e97-8b16-8bdc7c12da54.xml   |  30 ++++++++++++++++++++
 .../d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png       | Bin 44861 -> 0 bytes
 .../dd015243-ab77-435c-a13d-690566885121.png       | Bin 0 -> 44861 bytes
 .../pkl_ac8d301c-e5d9-4343-b6f3-ba2668adbe56.xml   |  30 ++++++++++++++++++++
 .../pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml   |  30 --------------------
 test/ref/write_interop_subtitle_test3/subs.xml     |   2 +-
 8 files changed, 68 insertions(+), 69 deletions(-)
 delete mode 100644 test/ref/write_interop_subtitle_test3/cpl_46c3eb45-15e5-47d6-8684-d8641e4dc516.xml
 create mode 100644 test/ref/write_interop_subtitle_test3/cpl_5407b210-4441-4e97-8b16-8bdc7c12da54.xml
 delete mode 100644 test/ref/write_interop_subtitle_test3/d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png
 create mode 100644 test/ref/write_interop_subtitle_test3/dd015243-ab77-435c-a13d-690566885121.png
 create mode 100644 test/ref/write_interop_subtitle_test3/pkl_ac8d301c-e5d9-4343-b6f3-ba2668adbe56.xml
 delete mode 100644 test/ref/write_interop_subtitle_test3/pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml

(limited to 'test/ref/write_interop_subtitle_test3')

diff --git a/test/ref/write_interop_subtitle_test3/ASSETMAP b/test/ref/write_interop_subtitle_test3/ASSETMAP
index 570b0d5b..8dfb256d 100644
--- a/test/ref/write_interop_subtitle_test3/ASSETMAP
+++ b/test/ref/write_interop_subtitle_test3/ASSETMAP
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AssetMap xmlns="http://www.digicine.com/PROTO-ASDCP-AM-20040311#">
-  <Id>urn:uuid:47a8e83e-fd5f-445d-a1bc-9f59c5289c34</Id>
+  <Id>urn:uuid:b3062f87-9060-4848-a664-d864d1877f1c</Id>
   <AnnotationText>Created by libdcp</AnnotationText>
   <VolumeCount>1</VolumeCount>
   <IssueDate>2018-09-02T04:45:18+00:00</IssueDate>
@@ -8,11 +8,11 @@
   <Creator>libdcp</Creator>
   <AssetList>
     <Asset>
-      <Id>urn:uuid:e94b8a0d-27f7-408a-af16-78d3df419a91</Id>
+      <Id>urn:uuid:ac8d301c-e5d9-4343-b6f3-ba2668adbe56</Id>
       <PackingList>true</PackingList>
       <ChunkList>
         <Chunk>
-          <Path>pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml</Path>
+          <Path>pkl_ac8d301c-e5d9-4343-b6f3-ba2668adbe56.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>1114</Length>
@@ -20,10 +20,10 @@
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id>
+      <Id>urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54</Id>
       <ChunkList>
         <Chunk>
-          <Path>cpl_46c3eb45-15e5-47d6-8684-d8641e4dc516.xml</Path>
+          <Path>cpl_5407b210-4441-4e97-8b16-8bdc7c12da54.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>1061</Length>
@@ -42,10 +42,10 @@
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71</Id>
+      <Id>urn:uuid:dd015243-ab77-435c-a13d-690566885121</Id>
       <ChunkList>
         <Chunk>
-          <Path>d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png</Path>
+          <Path>dd015243-ab77-435c-a13d-690566885121.png</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>44861</Length>
diff --git a/test/ref/write_interop_subtitle_test3/cpl_46c3eb45-15e5-47d6-8684-d8641e4dc516.xml b/test/ref/write_interop_subtitle_test3/cpl_46c3eb45-15e5-47d6-8684-d8641e4dc516.xml
deleted file mode 100644
index 0d283b64..00000000
--- a/test/ref/write_interop_subtitle_test3/cpl_46c3eb45-15e5-47d6-8684-d8641e4dc516.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CompositionPlaylist xmlns="http://www.digicine.com/PROTO-ASDCP-CPL-20040511#">
-  <Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id>
-  <AnnotationText>Created by libdcp</AnnotationText>
-  <IssueDate>2018-09-02T04:45:18+00:00</IssueDate>
-  <Issuer>libdcp</Issuer>
-  <Creator>libdcp</Creator>
-  <ContentTitleText>My film</ContentTitleText>
-  <ContentKind>feature</ContentKind>
-  <ContentVersion>
-    <Id>urn:uuid:6a9e31a6-50a4-4ecb-8683-fa667848470a</Id>
-    <LabelText>foo</LabelText>
-  </ContentVersion>
-  <RatingList/>
-  <ReelList>
-    <Reel>
-      <Id>urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470</Id>
-      <AssetList>
-        <MainSubtitle>
-          <Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</Id>
-          <AnnotationText></AnnotationText>
-          <EditRate>24 1</EditRate>
-          <IntrinsicDuration>6046</IntrinsicDuration>
-          <EntryPoint>0</EntryPoint>
-          <Duration>6046</Duration>
-          <Hash>cVnFjMLTQnSIAlIzJpNB/p7B230=</Hash>
-        </MainSubtitle>
-      </AssetList>
-    </Reel>
-  </ReelList>
-</CompositionPlaylist>
diff --git a/test/ref/write_interop_subtitle_test3/cpl_5407b210-4441-4e97-8b16-8bdc7c12da54.xml b/test/ref/write_interop_subtitle_test3/cpl_5407b210-4441-4e97-8b16-8bdc7c12da54.xml
new file mode 100644
index 00000000..5bbf02ec
--- /dev/null
+++ b/test/ref/write_interop_subtitle_test3/cpl_5407b210-4441-4e97-8b16-8bdc7c12da54.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CompositionPlaylist xmlns="http://www.digicine.com/PROTO-ASDCP-CPL-20040511#">
+  <Id>urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54</Id>
+  <AnnotationText>Created by libdcp</AnnotationText>
+  <IssueDate>2018-09-02T04:45:18+00:00</IssueDate>
+  <Issuer>libdcp</Issuer>
+  <Creator>libdcp</Creator>
+  <ContentTitleText>My film</ContentTitleText>
+  <ContentKind>feature</ContentKind>
+  <ContentVersion>
+    <Id>urn:uuid:b365eeb5-dcdf-4aaf-83f0-1202fa5d3ca8</Id>
+    <LabelText>foo</LabelText>
+  </ContentVersion>
+  <RatingList/>
+  <ReelList>
+    <Reel>
+      <Id>urn:uuid:73e16051-f99a-4bf4-b96a-c432d32aa19f</Id>
+      <AssetList>
+        <MainSubtitle>
+          <Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</Id>
+          <EditRate>24 1</EditRate>
+          <IntrinsicDuration>6046</IntrinsicDuration>
+          <EntryPoint>0</EntryPoint>
+          <Duration>6046</Duration>
+          <Hash>RmflhDu9QYUsNnBftdNlIEGdzG0=</Hash>
+        </MainSubtitle>
+      </AssetList>
+    </Reel>
+  </ReelList>
+</CompositionPlaylist>
diff --git a/test/ref/write_interop_subtitle_test3/d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png b/test/ref/write_interop_subtitle_test3/d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png
deleted file mode 100644
index 9d8f2988..00000000
Binary files a/test/ref/write_interop_subtitle_test3/d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png and /dev/null differ
diff --git a/test/ref/write_interop_subtitle_test3/dd015243-ab77-435c-a13d-690566885121.png b/test/ref/write_interop_subtitle_test3/dd015243-ab77-435c-a13d-690566885121.png
new file mode 100644
index 00000000..9d8f2988
Binary files /dev/null and b/test/ref/write_interop_subtitle_test3/dd015243-ab77-435c-a13d-690566885121.png differ
diff --git a/test/ref/write_interop_subtitle_test3/pkl_ac8d301c-e5d9-4343-b6f3-ba2668adbe56.xml b/test/ref/write_interop_subtitle_test3/pkl_ac8d301c-e5d9-4343-b6f3-ba2668adbe56.xml
new file mode 100644
index 00000000..362177c7
--- /dev/null
+++ b/test/ref/write_interop_subtitle_test3/pkl_ac8d301c-e5d9-4343-b6f3-ba2668adbe56.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PackingList xmlns="http://www.digicine.com/PROTO-ASDCP-PKL-20040311#">
+  <Id>urn:uuid:ac8d301c-e5d9-4343-b6f3-ba2668adbe56</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:5407b210-4441-4e97-8b16-8bdc7c12da54</Id>
+      <AnnotationText>5407b210-4441-4e97-8b16-8bdc7c12da54</AnnotationText>
+      <Hash>M9U2kzcnfcBAy7MrXZGKjA8hQRU=</Hash>
+      <Size>1061</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>RmflhDu9QYUsNnBftdNlIEGdzG0=</Hash>
+      <Size>438</Size>
+      <Type>text/xml;asdcpKind=Subtitle</Type>
+    </Asset>
+    <Asset>
+      <Id>urn:uuid:dd015243-ab77-435c-a13d-690566885121</Id>
+      <Hash>2vTylSKQ5MCQHbKPT4X+rlwfHk4=</Hash>
+      <Size>44861</Size>
+      <Type>image/png</Type>
+    </Asset>
+  </AssetList>
+</PackingList>
diff --git a/test/ref/write_interop_subtitle_test3/pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml b/test/ref/write_interop_subtitle_test3/pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml
deleted file mode 100644
index 6f192259..00000000
--- a/test/ref/write_interop_subtitle_test3/pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PackingList xmlns="http://www.digicine.com/PROTO-ASDCP-PKL-20040311#">
-  <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:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id>
-      <AnnotationText>46c3eb45-15e5-47d6-8684-d8641e4dc516</AnnotationText>
-      <Hash>Y8rZTMi93JjmkgwFK7Fu3W5rz/Y=</Hash>
-      <Size>1061</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>ilLkOSjxgHZxkAdOPVJBoDFiUh8=</Hash>
-      <Size>438</Size>
-      <Type>text/xml;asdcpKind=Subtitle</Type>
-    </Asset>
-    <Asset>
-      <Id>urn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71</Id>
-      <Hash>2vTylSKQ5MCQHbKPT4X+rlwfHk4=</Hash>
-      <Size>44861</Size>
-      <Type>image/png</Type>
-    </Asset>
-  </AssetList>
-</PackingList>
diff --git a/test/ref/write_interop_subtitle_test3/subs.xml b/test/ref/write_interop_subtitle_test3/subs.xml
index 050ee930..74901300 100644
--- a/test/ref/write_interop_subtitle_test3/subs.xml
+++ b/test/ref/write_interop_subtitle_test3/subs.xml
@@ -5,6 +5,6 @@
   <ReelNumber>1</ReelNumber>
   <Language>EN</Language>
   <Subtitle SpotNumber="1" TimeIn="00:04:09:229" TimeOut="00:04:11:229" FadeUpTime="0" FadeDownTime="0">
-    <Image VAlign="top" VPosition="80">d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png</Image>
+    <Image VAlign="top" VPosition="80">dd015243-ab77-435c-a13d-690566885121.png</Image>
   </Subtitle>
 </DCSubtitle>
-- 
cgit v1.2.3