Fix syntax of ContentVersion/Id in the reference.

diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index ed3d473d8c935c3c77b574b1a2eea12e48af4712..87879af777a6081c35a2969a2eea175d7fc0d8c5 100644 (file)
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -75,8 +75,8 @@ make_simple (boost::filesystem::path path)
        boost::filesystem::create_directories (path);
        shared_ptr<dcp::DCP> d (new dcp::DCP (path));
        shared_ptr<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE));
-       cpl->set_content_version_id ("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00");
-       cpl->set_content_version_label_text ("81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00");
+       cpl->set_content_version_id ("urn:uuid:75ac29aa-42ac-1234-ecae-49251abefd11");
+       cpl->set_content_version_label_text ("content-version-label-text");
        cpl->set_metadata (xml_meta);
 
        shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE));

diff --git a/test/ref/DCP/dcp_test1/ASSETMAP.xml b/test/ref/DCP/dcp_test1/ASSETMAP.xml
index bd4ffaa378799fa1d1070122369e949f20d98a7d..b0ad60dc7b379fe331c9d94c04310c178020068a 100644 (file)
--- a/test/ref/DCP/dcp_test1/ASSETMAP.xml
+++ b/test/ref/DCP/dcp_test1/ASSETMAP.xml
@@ -26,7 +26,7 @@
           <Path>cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
-          <Length>1646</Length>
+          <Length>1585</Length>
         </Chunk>
       </ChunkList>
     </Asset>

diff --git a/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
index ccfc1edfaf97ad33452ce9b977c9160f6d996a9f..f7134807ded699ed91311664a915a041c48a5add 100644 (file)
--- a/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
+++ b/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
@@ -8,8 +8,8 @@
   <ContentTitleText>A Test DCP</ContentTitleText>
   <ContentKind>feature</ContentKind>
   <ContentVersion>
-    <Id>urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</Id>
-    <LabelText>81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</LabelText>
+    <Id>urn:uuid:75ac29aa-42ac-1234-ecae-49251abefd11</Id>
+    <LabelText>content-version-label-text</LabelText>
   </ContentVersion>
   <RatingList/>
   <ReelList>

diff --git a/test/ref/DCP/dcp_test1/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml b/test/ref/DCP/dcp_test1/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml
index bc6b2035766bb8473db94c474e85754dfdac589a..8b24a133c78db09571c4891f223d445acabbc828 100644 (file)
--- a/test/ref/DCP/dcp_test1/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml
+++ b/test/ref/DCP/dcp_test1/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml
@@ -9,8 +9,8 @@
     <Asset>
       <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
       <AnnotationText>81fb54df-e1bf-4647-8788-ea7ba154375b</AnnotationText>
-      <Hash>ZtuszZE/7gxhCt7DVmzbsZB5SnI=</Hash>
-      <Size>1646</Size>
+      <Hash>Cl6gCndMaVEwx+b353yT+AyOKJw=</Hash>
+      <Size>1585</Size>
       <Type>text/xml</Type>
     </Asset>
     <Asset>

diff --git a/test/ref/DCP/dcp_test7/ASSETMAP b/test/ref/DCP/dcp_test7/ASSETMAP
index 920e95c5ad5e0d22af827de2458feb0b2d71bae6..1def7fa3c963429c58d119b06273ca3b2a43aa24 100644 (file)
--- a/test/ref/DCP/dcp_test7/ASSETMAP
+++ b/test/ref/DCP/dcp_test7/ASSETMAP
@@ -26,7 +26,7 @@
           <Path>cpl_1d513f84-5856-4f91-a88a-4d452cc6a28a.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
-          <Length>1648</Length>
+          <Length>1587</Length>
         </Chunk>
       </ChunkList>
     </Asset>

diff --git a/test/ref/DCP/dcp_test7/cpl_1d513f84-5856-4f91-a88a-4d452cc6a28a.xml b/test/ref/DCP/dcp_test7/cpl_1d513f84-5856-4f91-a88a-4d452cc6a28a.xml
index c751f116408e605cc4ab44e73224e31ed55d8823..93a83a507d85da694cb2c3f7bc037b7eb296a353 100644 (file)
--- a/test/ref/DCP/dcp_test7/cpl_1d513f84-5856-4f91-a88a-4d452cc6a28a.xml
+++ b/test/ref/DCP/dcp_test7/cpl_1d513f84-5856-4f91-a88a-4d452cc6a28a.xml
@@ -8,8 +8,8 @@
   <ContentTitleText>A Test DCP</ContentTitleText>
   <ContentKind>feature</ContentKind>
   <ContentVersion>
-    <Id>urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</Id>
-    <LabelText>81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</LabelText>
+    <Id>urn:uuid:75ac29aa-42ac-1234-ecae-49251abefd11</Id>
+    <LabelText>content-version-label-text</LabelText>
   </ContentVersion>
   <RatingList/>
   <ReelList>

diff --git a/test/ref/DCP/dcp_test7/pkl_a800aea0-904b-4bd0-9250-374fdb46528b.xml b/test/ref/DCP/dcp_test7/pkl_a800aea0-904b-4bd0-9250-374fdb46528b.xml
index 8a7600c00fce5cda6523cc5d8d03d923cad7da89..a12f44fbf75710545fa1b07ee056698f25175e6f 100644 (file)
--- a/test/ref/DCP/dcp_test7/pkl_a800aea0-904b-4bd0-9250-374fdb46528b.xml
+++ b/test/ref/DCP/dcp_test7/pkl_a800aea0-904b-4bd0-9250-374fdb46528b.xml
@@ -9,8 +9,8 @@
     <Asset>
       <Id>urn:uuid:1d513f84-5856-4f91-a88a-4d452cc6a28a</Id>
       <AnnotationText>1d513f84-5856-4f91-a88a-4d452cc6a28a</AnnotationText>
-      <Hash>Vh8NXTKfAV32QoJkxkO7KsCfzVo=</Hash>
-      <Size>1648</Size>
+      <Hash>PJ7NPfT/cZC6XfoLWX+wiaGH/yQ=</Hash>
+      <Size>1587</Size>
       <Type>text/xml;asdcpKind=CPL</Type>
     </Asset>
     <Asset>