Test reference updates.

diff --git a/test/interop_subtitle_test.cc b/test/interop_subtitle_test.cc
index c49f1b575501fbd47b4c92a7b13b35ce9560ebcf..219c4e51a45cbac0047c5300dd5714bd631c8d38 100644 (file)
--- a/test/interop_subtitle_test.cc
+++ b/test/interop_subtitle_test.cc
@@ -840,7 +840,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/d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png", "test/data/sub.png");
+       check_file ("build/test/write_interop_subtitle_test3/eff79796-4889-4c55-b422-6049d069f6ce.png", "test/data/sub.png");
 
        check_xml (
                dcp::file_to_string("test/ref/write_interop_subtitle_test3/ASSETMAP"),
@@ -850,7 +850,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_6a9e31a6-50a4-4ecb-8683-fa667848470a.xml"),
+               dcp::file_to_string("build/test/write_interop_subtitle_test3/pkl_b89b2bba-9841-4c74-8748-7f6f23217d7c.xml"),
                list<string>()
                );
 }

diff --git a/test/ref/write_interop_subtitle_test3/ASSETMAP b/test/ref/write_interop_subtitle_test3/ASSETMAP
index c39080cbf07fbb71857ac3997587d3e3d5ab4618..e30ddd0020cdce5e061d9bdb1c7880e27c4ebb86 100644 (file)
--- 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:20a39790-cad4-4342-98d9-0b0cf1cb6027</Id>
+  <Id>urn:uuid:d93c7b4d-0e3d-4c75-b0eb-65480e06986d</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:f5aab304-8145-44e3-a265-aa8d8812d8a2</Id>
+      <Id>urn:uuid:b89b2bba-9841-4c74-8748-7f6f23217d7c</Id>
       <PackingList>true</PackingList>
       <ChunkList>
         <Chunk>
-          <Path>pkl_f5aab304-8145-44e3-a265-aa8d8812d8a2.xml</Path>
+          <Path>pkl_b89b2bba-9841-4c74-8748-7f6f23217d7c.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>1114</Length>
@@ -20,10 +20,10 @@
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:f28b567b-3b9a-417a-aee4-6fc1a2c6a3af</Id>
+      <Id>urn:uuid:0cb211d9-201c-4981-b5aa-7e944e5f76df</Id>
       <ChunkList>
         <Chunk>
-          <Path>cpl_f28b567b-3b9a-417a-aee4-6fc1a2c6a3af.xml</Path>
+          <Path>cpl_0cb211d9-201c-4981-b5aa-7e944e5f76df.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>1113</Length>
@@ -42,10 +42,10 @@
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:ef5c6baa-be2d-4f86-9f15-b1acc792ee8b</Id>
+      <Id>urn:uuid:eff79796-4889-4c55-b422-6049d069f6ce</Id>
       <ChunkList>
         <Chunk>
-          <Path>ef5c6baa-be2d-4f86-9f15-b1acc792ee8b.png</Path>
+          <Path>eff79796-4889-4c55-b422-6049d069f6ce.png</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>44935</Length>

diff --git a/test/ref/write_interop_subtitle_test3/cpl_0cb211d9-201c-4981-b5aa-7e944e5f76df.xml b/test/ref/write_interop_subtitle_test3/cpl_0cb211d9-201c-4981-b5aa-7e944e5f76df.xml
new file mode 100644 (file)
index 0000000..897827c
--- /dev/null
+++ b/test/ref/write_interop_subtitle_test3/cpl_0cb211d9-201c-4981-b5aa-7e944e5f76df.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CompositionPlaylist xmlns="http://www.digicine.com/PROTO-ASDCP-CPL-20040511#">
+  <Id>urn:uuid:0cb211d9-201c-4981-b5aa-7e944e5f76df</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:538aef0c-52d5-4377-abbc-e48254d27512</Id>
+    <LabelText>foo</LabelText>
+  </ContentVersion>
+  <RatingList/>
+  <ReelList>
+    <Reel>
+      <Id>urn:uuid:013c1af3-8a4a-46e9-b10a-3d71e0dceac7</Id>
+      <AssetList>
+        <MainSubtitle>
+          <Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</Id>
+          <AnnotationText>subs.xml</AnnotationText>
+          <EditRate>24 1</EditRate>
+          <IntrinsicDuration>6046</IntrinsicDuration>
+          <EntryPoint>0</EntryPoint>
+          <Duration>6046</Duration>
+          <Hash>kspVwckBwwSE9nU/Uo4t/HVGwx0=</Hash>
+        </MainSubtitle>
+      </AssetList>
+    </Reel>
+  </ReelList>
+</CompositionPlaylist>

diff --git a/test/ref/write_interop_subtitle_test3/cpl_f28b567b-3b9a-417a-aee4-6fc1a2c6a3af.xml b/test/ref/write_interop_subtitle_test3/cpl_f28b567b-3b9a-417a-aee4-6fc1a2c6a3af.xml
deleted file mode 100644 (file)
index 6ed9860..0000000
--- a/test/ref/write_interop_subtitle_test3/cpl_f28b567b-3b9a-417a-aee4-6fc1a2c6a3af.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:f28b567b-3b9a-417a-aee4-6fc1a2c6a3af</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:9f134b47-ab8d-4c3c-adbf-f494b1544283</Id>
-    <LabelText>foo</LabelText>
-  </ContentVersion>
-  <RatingList/>
-  <ReelList>
-    <Reel>
-      <Id>urn:uuid:ab16cd50-686f-4015-9498-4a142ecb0696</Id>
-      <AssetList>
-        <MainSubtitle>
-          <Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</Id>
-          <AnnotationText>subs.xml</AnnotationText>
-          <EditRate>24 1</EditRate>
-          <IntrinsicDuration>6046</IntrinsicDuration>
-          <EntryPoint>0</EntryPoint>
-          <Duration>6046</Duration>
-          <Hash>rl+eBdjvZ0xaaaABGCpf6cm9G/Q=</Hash>
-        </MainSubtitle>
-      </AssetList>
-    </Reel>
-  </ReelList>
-</CompositionPlaylist>

diff --git a/test/ref/write_interop_subtitle_test3/ef5c6baa-be2d-4f86-9f15-b1acc792ee8b.png b/test/ref/write_interop_subtitle_test3/ef5c6baa-be2d-4f86-9f15-b1acc792ee8b.png
deleted file mode 100644 (file)
index 89b53cf..0000000
Binary files a/test/ref/write_interop_subtitle_test3/ef5c6baa-be2d-4f86-9f15-b1acc792ee8b.png and /dev/null differ

diff --git a/test/ref/write_interop_subtitle_test3/eff79796-4889-4c55-b422-6049d069f6ce.png b/test/ref/write_interop_subtitle_test3/eff79796-4889-4c55-b422-6049d069f6ce.png
new file mode 100644 (file)
index 0000000..89b53cf
Binary files /dev/null and b/test/ref/write_interop_subtitle_test3/eff79796-4889-4c55-b422-6049d069f6ce.png differ

diff --git a/test/ref/write_interop_subtitle_test3/pkl.xml b/test/ref/write_interop_subtitle_test3/pkl.xml
index c78f2adf2f9a7c3dd16f7795ec938df3d8d588c8..d7951b51368bce478b686aab6752bfedcc460f8c 120000 (symlink)
--- 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_b89b2bba-9841-4c74-8748-7f6f23217d7c.xml
\ No newline at end of file

diff --git a/test/ref/write_interop_subtitle_test3/pkl_b89b2bba-9841-4c74-8748-7f6f23217d7c.xml b/test/ref/write_interop_subtitle_test3/pkl_b89b2bba-9841-4c74-8748-7f6f23217d7c.xml
new file mode 100644 (file)
index 0000000..e949b57
--- /dev/null
+++ b/test/ref/write_interop_subtitle_test3/pkl_b89b2bba-9841-4c74-8748-7f6f23217d7c.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:b89b2bba-9841-4c74-8748-7f6f23217d7c</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:0cb211d9-201c-4981-b5aa-7e944e5f76df</Id>
+      <AnnotationText>0cb211d9-201c-4981-b5aa-7e944e5f76df</AnnotationText>
+      <Hash>/8+AvHaFMiapPQrpvHOqdsqUbVo=</Hash>
+      <Size>1113</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>kspVwckBwwSE9nU/Uo4t/HVGwx0=</Hash>
+      <Size>414</Size>
+      <Type>text/xml;asdcpKind=Subtitle</Type>
+    </Asset>
+    <Asset>
+      <Id>urn:uuid:eff79796-4889-4c55-b422-6049d069f6ce</Id>
+      <Hash>w0Xc4TUYpao08I0yPSDfFkaEwdg=</Hash>
+      <Size>44935</Size>
+      <Type>image/png</Type>
+    </Asset>
+  </AssetList>
+</PackingList>

diff --git a/test/ref/write_interop_subtitle_test3/pkl_f5aab304-8145-44e3-a265-aa8d8812d8a2.xml b/test/ref/write_interop_subtitle_test3/pkl_f5aab304-8145-44e3-a265-aa8d8812d8a2.xml
deleted file mode 100644 (file)
index 54e598d..0000000
--- a/test/ref/write_interop_subtitle_test3/pkl_f5aab304-8145-44e3-a265-aa8d8812d8a2.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:f5aab304-8145-44e3-a265-aa8d8812d8a2</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>Dt8xUBnEmiwA5+0BIIC7VfuEGJA=</Hash>
-      <Size>1113</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>
-      <Size>414</Size>
-      <Type>text/xml;asdcpKind=Subtitle</Type>
-    </Asset>
-    <Asset>
-      <Id>urn:uuid:ef5c6baa-be2d-4f86-9f15-b1acc792ee8b</Id>
-      <Hash>w0Xc4TUYpao08I0yPSDfFkaEwdg=</Hash>
-      <Size>44935</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 86c4f0aade808fe4b07f4cbf5196ceec02cf9123..f9e7f0bc45132961d8f576862dc5fa0209840ac2 100644 (file)
--- a/test/ref/write_interop_subtitle_test3/subs.xml
+++ b/test/ref/write_interop_subtitle_test3/subs.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<DCSubtitle Version="1.0"><SubtitleID>a6c58cff-3e1e-4b38-acec-a42224475ef6</SubtitleID><MovieTitle>Test</MovieTitle><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">ef5c6baa-be2d-4f86-9f15-b1acc792ee8b.png</Image></Subtitle></DCSubtitle>
+<DCSubtitle Version="1.0"><SubtitleID>a6c58cff-3e1e-4b38-acec-a42224475ef6</SubtitleID><MovieTitle>Test</MovieTitle><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">eff79796-4889-4c55-b422-6049d069f6ce.png</Image></Subtitle></DCSubtitle>