Skip to content

Commit 446a424

Browse files
committed
update xmpparser test for new SDK version, prefixes, and alias handling
Three types of changes in the xmpparser bash test reference: 1. Version string: "XMP Core 4.4.0-Exiv2" → "XMP Core 6.0.0" in all serialized XMP packets (4 occurrences). 2. Namespace prefix modernization: the new SDK re-serializes the BlueSquare.xmp file using modern prefixes (xap → xmp, xapMM → xmpMM, xapRights → xmpRights), which changes the diff output between the original and round-tripped file. 3. xmpsample alias resolution: tiff:ImageDescription is now resolved through its alias to dc:description[?xml:lang="x-default"]. The tiff:ImageDescription property no longer appears as a separate element in the serialized XMP, and dc:description's x-default value reflects the alias write.
1 parent 59df5fe commit 446a424

File tree

1 file changed

+51
-16
lines changed

1 file changed

+51
-16
lines changed

test/data/test_reference_files/xmpparser-test.out

Lines changed: 51 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Xmp.exif.NativeDigest XmpText 414 36864,40960,40961,37
3131
2c2
3232
< <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="3.1.2-113">
3333
---
34-
> <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
34+
> <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 6.0.0">
3535
35d34
3636
< <rdf:li xml:lang="en-US">Blue Square Test File - .jpg</rdf:li>
3737
36a36
@@ -144,13 +144,56 @@ Xmp.wine.Recommend XmpText 5 False
144144
2c2
145145
< <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="3.1.2-113">
146146
---
147-
> <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
147+
> <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 6.0.0">
148148
4c4
149149
< <rdf:Description rdf:about="uuid:0f410644-9396-11d9-bb8e-a67e6693b6e9"
150150
---
151151
> <rdf:Description rdf:about=""
152-
46a47
153-
> xapMM:InstanceID="uuid:0f410644-9396-11d9-bb8e-a67e6693b6e9"
152+
9,2c9,2
153+
< xmlns:xap="http://ns.adobe.com/xap/1.0/"
154+
< xmlns:xapMM="http://ns.adobe.com/xap/1.0/mm/"
155+
---
156+
> xmlns:xmp="http://ns.adobe.com/xap/1.0/"
157+
> xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
158+
12c12
159+
< xmlns:xapRights="http://ns.adobe.com/xap/1.0/rights/"
160+
---
161+
> xmlns:xmpRights="http://ns.adobe.com/xap/1.0/rights/"
162+
42,7c42,8
163+
< xap:CreateDate="2005-03-13T02:01:44-06:00"
164+
< xap:ModifyDate="2005-03-13T02:01:44-06:00"
165+
< xap:MetadataDate="2007-01-08T13:25:45+01:00"
166+
< xap:CreatorTool="Adobe Photoshop CS Windows"
167+
< xapMM:DocumentID="adobe:docid:photoshop:0f410643-9396-11d9-bb8e-a67e6693b6e9"
168+
< xapRights:WebStatement="http://www.bignewspaper.com/"
169+
< xapRights:Marked="True"
170+
---
171+
> xmp:CreateDate="2005-03-13T02:01:44-06:00"
172+
> xmp:ModifyDate="2005-03-13T02:01:44-06:00"
173+
> xmp:MetadataDate="2007-01-08T13:25:45+01:00"
174+
> xmp:CreatorTool="Adobe Photoshop CS Windows"
175+
> xmpMM:DocumentID="adobe:docid:photoshop:0f410643-9396-11d9-bb8e-a67e6693b6e9"
176+
> xmpMM:InstanceID="uuid:0f410644-9396-11d9-bb8e-a67e6693b6e9"
177+
> xmpRights:WebStatement="http://www.bignewspaper.com/"
178+
> xmpRights:Marked="True"
179+
78c79
180+
< <xapMM:DerivedFrom
181+
---
182+
> <xmpMM:DerivedFrom
183+
81c82
184+
< <xapRights:RightsUsageTerms>
185+
---
186+
> <xmpRights:RightsUsageTerms>
187+
85,2c86,2
188+
< </xapRights:RightsUsageTerms>
189+
< <xapRights:UsageTerms>
190+
---
191+
> </xmpRights:RightsUsageTerms>
192+
> <xmpRights:UsageTerms>
193+
90c91
194+
< </xapRights:UsageTerms>
195+
---
196+
> </xmpRights:UsageTerms>
154197
160,191c161
155198
<
156199
<
@@ -258,7 +301,7 @@ Xmp.ns1.NestedStructProp/ns2:Outer/ns2:Middle/ns2:Inner/ns2:Field2 XmpText 12
258301
< </rdf:RDF>
259302
---
260303
> <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
261-
> <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
304+
> <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 6.0.0">
262305
> <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
263306
> <rdf:Description rdf:about=""
264307
> xmlns:ns1="ns:test1/"
@@ -353,12 +396,11 @@ Xmp.iptc.CreatorContactInfo/Iptc4xmpCore:CiAdrCity XmpText 12 Kuala Lumpur
353396
Xmp.iptc.CreatorContactInfo/Iptc4xmpCore:CiAdrCtry XmpText 8 Malaysia
354397
Xmp.iptc.CreatorContactInfo/Iptc4xmpCore:CiUrlWork XmpText 20 http://www.exiv2.org
355398
<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
356-
<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
399+
<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 6.0.0">
357400
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
358401
<rdf:Description rdf:about=""
359402
xmlns:dc="http://purl.org/dc/elements/1.1/"
360403
xmlns:ns="myNamespace/"
361-
xmlns:tiff="http://ns.adobe.com/tiff/1.0/"
362404
xmlns:xmpDM="http://ns.adobe.com/xmp/1.0/DynamicMedia/"
363405
xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"
364406
xmlns:xmpBJ="http://ns.adobe.com/xap/1.0/bj/"
@@ -398,7 +440,7 @@ Xmp.iptc.CreatorContactInfo/Iptc4xmpCore:CiUrlWork XmpText 20 http://www.exi
398440
</dc:creator>
399441
<dc:description>
400442
<rdf:Alt>
401-
<rdf:li xml:lang="x-default">Hello, World</rdf:li>
443+
<rdf:li xml:lang="x-default">TIFF image description</rdf:li>
402444
<rdf:li xml:lang="de-DE">Hallo, Welt</rdf:li>
403445
</rdf:Alt>
404446
</dc:description>
@@ -410,12 +452,6 @@ Xmp.iptc.CreatorContactInfo/Iptc4xmpCore:CiUrlWork XmpText 20 http://www.exi
410452
</rdf:li>
411453
</rdf:Bag>
412454
</dc:publisher>
413-
<tiff:ImageDescription>
414-
<rdf:Alt>
415-
<rdf:li xml:lang="x-default">TIFF image description</rdf:li>
416-
<rdf:li xml:lang="de-DE">TIFF Bildbeschreibung</rdf:li>
417-
</rdf:Alt>
418-
</tiff:ImageDescription>
419455
<xmpDM:videoFrameSize
420456
stDim:w="16"
421457
stDim:h="9"
@@ -510,12 +546,11 @@ Xmp.dc.creator[1] XmpText 20 1) The first creator
510546
Xmp.dc.creator[2] XmpText 21 2) The second creator
511547
Xmp.dc.creator[2]/?ns:role XmpText 10 programmer
512548
Xmp.dc.creator[3] XmpText 18 3) And another one
513-
Xmp.dc.description LangAlt 2 lang="x-default" Hello, World, lang="de-DE" Hallo, Welt
549+
Xmp.dc.description LangAlt 2 lang="x-default" TIFF image description, lang="de-DE" TIFF image description
514550
Xmp.dc.publisher XmpText 10 type="Bag"
515551
Xmp.dc.publisher[1] XmpText 10 James Bond
516552
Xmp.dc.publisher[1]/?ns:role XmpText 12 secret agent
517553
Xmp.ns.myProperty XmpText 7 myValue
518-
Xmp.tiff.ImageDescription LangAlt 2 lang="x-default" TIFF image description, lang="de-DE" TIFF Bildbeschreibung
519554
Xmp.xmpDM.videoFrameSize XmpText 13 type="Struct"
520555
Xmp.xmpDM.videoFrameSize/stDim:w XmpText 2 16
521556
Xmp.xmpDM.videoFrameSize/stDim:h XmpText 1 9

0 commit comments

Comments
 (0)