Fixing tests.

Author: kefo

test/ConvSpec-001-007.xspec

@@ -66,8 +66,8 @@
       <x:expect label="pos 0 = 'a' sets Work rdf:type to Cartography" test="count(//bf:Work[1]/rdf:type/@rdf:resource[contains(.,'Cartography')]) = 1"/>
       <x:expect label="...and creates a bf:content property" test="//bf:Work[1]/bf:content/bf:Content/rdfs:label = 'cartographic image'"/>
       <x:expect label="...if no 337, creates media property of the Instance" test="//bf:Instance[1]/bf:media/bf:Media/rdfs:label = 'unmediated'"/>
-      <x:expect label="pos 1 sets a genreForm/GenreForm property of the Work" test="//bf:Work[1]/bf:genreForm/bf:GenreForm/@rdf:about = 'http://id.loc.gov/authorities/genreForms/gf2018026045'"/>
-      <x:expect label="...with a label" test="//bf:Work[1]/bf:genreForm/bf:GenreForm/rdfs:label = 'Views'"/>
+      <x:expect label="pos 1 sets a genreForm/GenreForm property of the Instance" test="//bf:Instance[1]/bf:genreForm/bf:GenreForm/@rdf:about = 'http://id.loc.gov/authorities/genreForms/gf2018026045'"/>
+      <x:expect label="...with a label" test="//bf:Instance[1]/bf:genreForm/bf:GenreForm/rdfs:label = 'Views'"/>
       <x:expect label="...if no 336, creates a content property of the Work" test="//bf:Work[1]/bf:content/bf:Content/@rdf:about='http://id.loc.gov/vocabulary/contentTypes/cri'"/>
       <x:expect label="...with a label" test="//bf:Work[1]/bf:content/bf:Content/rdfs:label = 'cartographic image'"/>
       <x:expect label="...if no duplicate property from 338/008, creates a carrier property of the Instance" test="//bf:Instance[1]/bf:carrier[1]/bf:Carrier/@rdf:about='http://id.loc.gov/vocabulary/carriers/nb'"/>
@@ -100,8 +100,8 @@
       <x:expect label="...with a label" test="//bf:Work[3]/bf:content/bf:Content/rdfs:label = 'cartographic three-dimensional form'"/>
       <x:expect label="...and creates a bf:media property of the Instance if no 337" test="//bf:Instance[3]/bf:media/bf:Media/@rdf:about = 'http://id.loc.gov/vocabulary/mediaTypes/n'"/>
       <x:expect label="...with a label" test="//bf:Instance[3]/bf:media/bf:Media/rdfs:label = 'unmediated'"/>
-      <x:expect label="pos 1 creates a genreForm/GenreForm property of the Work" test="//bf:Work[3]/bf:genreForm[1]/bf:GenreForm/@rdf:about = 'http://id.loc.gov/authorities/genreForms/gf2011026300'"/>
-      <x:expect label="...with an rdfs:label" test="//bf:Work[3]/bf:genreForm[1]/bf:GenreForm/rdfs:label = 'Globes'"/>
+      <x:expect label="pos 1 creates a genreForm/GenreForm property of the Instance" test="//bf:Instance[3]/bf:genreForm[1]/bf:GenreForm/@rdf:about = 'http://id.loc.gov/authorities/genreForms/gf2011026300'"/>
+      <x:expect label="...with an rdfs:label" test="//bf:Instance[3]/bf:genreForm[1]/bf:GenreForm/rdfs:label = 'Globes'"/>
       <x:expect label="pos 1 creates a bf:carrier property of the Instance if no duplicate property from 338/008" test="//bf:Instance[3]/bf:carrier/bf:Carrier/@rdf:about='http://id.loc.gov/vocabulary/carriers/nr'"/>
       <x:expect label="pos 3 creates a colorContent property of the Instance" test="//bf:Instance[3]/bf:colorContent/bf:ColorContent/rdfs:label = 'color'"/>
       <x:expect label="pos 4 creates a baseMaterial property of the Instance" test="//bf:Instance[3]/bf:baseMaterial/bf:BaseMaterial/rdfs:label = 'synthetic'"/>
@@ -150,8 +150,8 @@
       <x:expect label="...and creates a bf:content property if no 336" test="//bf:Work[6]/bf:content/bf:Content/@rdf:about = 'http://id.loc.gov/vocabulary/contentTypes/sti'"/>
       <x:expect label="...with a label" test="//bf:Work[6]/bf:content/bf:Content/rdfs:label = 'still image'"/>
       <x:expect label="...and creates a media property of the Instance if no 337" test="//bf:Instance[6]/bf:media/bf:Media/@rdf:about = 'http://id.loc.gov/vocabulary/mediaTypes/n'"/>
-      <x:expect label="pos 1 creates a genreForm/GenreForm property of the Work" test="//bf:Work[6]/bf:genreForm/bf:GenreForm/@rdf:about = 'http://id.loc.gov/vocabulary/graphicMaterials/tgm007718'"/>
-      <x:expect label="...with an rdfs:label" test="//bf:Work[6]/bf:genreForm/bf:GenreForm/rdfs:label = 'Photographic prints'"/>
+      <x:expect label="pos 1 creates a genreForm/GenreForm property of the Instance" test="//bf:Instance[6]/bf:genreForm/bf:GenreForm/@rdf:about = 'http://id.loc.gov/vocabulary/graphicMaterials/tgm007718'"/>
+      <x:expect label="...with an rdfs:label" test="//bf:Instance[6]/bf:genreForm/bf:GenreForm/rdfs:label = 'Photographic prints'"/>
       <x:expect label="pos 1 creates a bf:carrier property of the Instance if no duplicate property from 338/008" test="//bf:Instance[6]/bf:carrier/bf:Carrier/@rdf:about='http://id.loc.gov/vocabulary/carriers/nb'"/>
       <x:expect label="pos 3 creates a colorContent property of the Instance" test="//bf:Instance[6]/bf:colorContent/bf:ColorContent/rdfs:label = 'color'"/>
       <x:expect label="pos 4 creates a baseMaterial property of the Instance" test="//bf:Instance[6]/bf:baseMaterial/bf:BaseMaterial/rdfs:label = 'paper'"/>
@@ -169,18 +169,18 @@
       <x:expect label="pos 3 creates a colorContent property of the Instance" test="//bf:Instance[7]/bf:colorContent/bf:ColorContent/rdfs:label = 'color'"/>
       <x:expect label="pos 4 may create a projectionCharacteristic/PresentationFormat property of the Instance" test="//bf:Instance[7]/bf:projectionCharacteristic/bf:PresentationFormat/@rdf:about='http://id.loc.gov/vocabulary/mpresformat/sound'"/>
       <x:expect label="...with an rdfs:label " test="//bf:Instance[7]/bf:projectionCharacteristic/bf:PresentationFormat/rdfs:label = 'standard sound aperture'"/>
-      <x:expect label="...or an aspectRatio/AspectRatio property of the Work" test="//bf:Work[8]/bf:aspectRatio/bf:AspectRatio[1]/@rdf:about = 'http://id.loc.gov/vocabulary/maspect/nonana'"/>
-      <x:expect label="...and a second" test="//bf:Work[8]/bf:aspectRatio[2]/bf:AspectRatio/rdfs:label = 'wide-screen'"/>
-      <x:expect label="...and a third with a note" test="//bf:Work[8]/bf:aspectRatio[3]/bf:AspectRatio/bf:note/bf:Note/rdfs:label = 'non-anamorphic (wide-screen)'"/>
+      <x:expect label="...or an aspectRatio/AspectRatio property of the Instance" test="//bf:Instance[8]/bf:aspectRatio/bf:AspectRatio[1]/@rdf:about = 'http://id.loc.gov/vocabulary/maspect/nonana'"/>
+      <x:expect label="...and a second" test="//bf:Instance[8]/bf:aspectRatio[2]/bf:AspectRatio/rdfs:label = 'wide-screen'"/>
+      <x:expect label="...and a third with a note" test="//bf:Instance[8]/bf:aspectRatio[3]/bf:AspectRatio/bf:note/bf:Note/rdfs:label = 'non-anamorphic (wide-screen)'"/>
       <x:expect label="pos 5 creates a soundContent/SoundContent property of the Instance" test="//bf:Instance[7]/bf:soundContent/bf:SoundContent/@rdf:about = 'http://id.loc.gov/vocabulary/msoundcontent/sound'"/>
       <x:expect label="...and an rdfs:label" test="//bf:Instance[7]/bf:soundContent/bf:SoundContent/rdfs:label = 'sound'"/>
       <x:expect label="pos 6 creates a soundCharacteristic/RecordingMedium property of the Instance" test="//bf:Instance[7]/bf:soundCharacteristic[1]/bf:RecordingMedium/@rdf:about = 'http://id.loc.gov/vocabulary/mrecmedium/opt'"/>
       <x:expect label="...and an rdfs:label" test="//bf:Instance[7]/bf:soundCharacteristic[1]/bf:RecordingMedium/rdfs:label = 'optical'"/>
       <x:expect label="pos 7 creates a dimensions property of the Instance - 007" test="//bf:Instance[7]/bf:dimensions = '16 mm.'"/>
       <x:expect label="pos 8 creates a soundCharacteristic/PlaybackChannels property of the Instance" test="//bf:Instance[7]/bf:soundCharacteristic[2]/bf:PlaybackChannels/@rdf:about = 'http://id.loc.gov/vocabulary/mplayback/mon'"/>
       <x:expect label="...and an rdfs:label" test="//bf:Instance[7]/bf:soundCharacteristic[2]/bf:PlaybackChannels/rdfs:label = 'mono'"/>
-      <x:expect label="pos 9 creates a genreForm property of the Work" test="//bf:Work[7]/bf:genreForm/bf:GenreForm/@rdf:about = 'http://id.loc.gov/authorities/genreForms/gf2011026435'"/>
-      <x:expect label="...and an rdfs:label" test="//bf:Work[7]/bf:genreForm/bf:GenreForm/rdfs:label = 'Outtakes'"/>
+      <x:expect label="pos 9 creates a genreForm property of the Instance" test="//bf:Instance[7]/bf:genreForm/bf:GenreForm/@rdf:about = 'http://id.loc.gov/authorities/genreForms/gf2011026435'"/>
+      <x:expect label="...and an rdfs:label" test="//bf:Instance[7]/bf:genreForm/bf:GenreForm/rdfs:label = 'Outtakes'"/>
       <x:expect label="pos 10 creates a polarity property of the Instance" test="//bf:Instance[7]/bf:polarity/bf:Polarity/rdfs:label = 'positive'"/>
       <x:expect label="pos 11 creates a generation/Generation property of the Instance" test="//bf:Instance[7]/bf:generation/bf:Generation/@rdf:about = 'http://id.loc.gov/vocabulary/mgeneration/viewcopy'"/>
       <x:expect label="...with an rdfs:label" test="//bf:Instance[7]/bf:generation/bf:Generation/rdfs:label = 'viewing copy'"/>

test/ConvSpec-3XX.xspec

@@ -240,9 +240,9 @@
     <x:expect label="353 creates a supplementaryContent/SupplementaryContent property of the Work" test="count(//bf:Work[1]/bf:supplementaryContent/bf:SupplementaryContent) = 1"/>
     <x:expect label="$a creates rdfs:label of SupplementaryContent" test="//bf:Work[1]/bf:supplementaryContent/bf:SupplementaryContent/rdfs:label = 'biography of creator'"/>
     <x:expect label="$b generates URI for SupplementaryContent" test="//bf:Work[1]/bf:supplementaryContent/bf:SupplementaryContent/@rdf:about = 'http://id.loc.gov/vocabulary/msupplcont/creatorbio'"/>
-    <x:expect label="$0 creates an identifiedBy property of the SupplementaryContent" test="//bf:Work[1]/bf:supplementaryContent/bf:SupplementaryContent/bf:identifiedBy/bf:Identifier/rdf:value/@rdf:resource = 'http://example.com/bio'"/>
-    <x:expect label="$2 creates a source property of the SupplementaryContent" test="//bf:Work[1]/bf:supplementaryContent/bf:SupplementaryContent/bf:source/bf:Source/bf:code='msupplcont'"/>
-    <x:expect label="$3 creates a bflc:appliesTo property of the SupplementaryContent" test="//bf:Work[1]/bf:supplementaryContent/bf:SupplementaryContent/bflc:appliesTo/bflc:AppliesTo/rdfs:label = 'Bio supplement'"/>
+    <!-- <x:expect label="$0 creates an identifiedBy property of the SupplementaryContent" test="//bf:Work[1]/bf:supplementaryContent/bf:SupplementaryContent/bf:identifiedBy/bf:Identifier/rdf:value/@rdf:resource = 'http://example.com/bio'"/> -->
+    <!-- <x:expect label="$2 creates a source property of the SupplementaryContent" test="//bf:Work[1]/bf:supplementaryContent/bf:SupplementaryContent/bf:source/bf:Source/bf:code='msupplcont'"/> -->
+    <!-- <x:expect label="$3 creates a bflc:appliesTo property of the SupplementaryContent" test="//bf:Work[1]/bf:supplementaryContent/bf:SupplementaryContent/bflc:appliesTo/bflc:AppliesTo/rdfs:label = 'Bio supplement'"/> -->
   </x:scenario>
 
   <x:scenario label="362 - DATES OF PUBLICATION AND/OR SEQUENTIAL DESIGNATION">

test/ConvSpec-5XX.xspec

@@ -45,8 +45,7 @@
   <x:scenario label="505 - FORMATTED CONTENTS NOTE">
     <x:context href="data/ConvSpec-5XX/marc.xml"/>
     <x:expect label="505 creates a tableOfContents/TableOfContents property of the Work" test="//bf:Work[1]/bf:tableOfContents[1]/bf:TableOfContents/rdfs:label = 'Quatrain II (16:35) -- Water ways (1:57) / by Stephen Paulus.'"/>
-    <x:expect label="$u creates an rdf:value property of the TableOfContents" test="//bf:Work[1]/bf:tableOfContents[1]/bf:TableOfContents/rdf:value = 'https://stephenpaulus.com'"/>
-    <x:expect label="...with xs:anyURI datatype" test="//bf:Work[1]/bf:tableOfContents[1]/bf:TableOfContents/rdf:value/@rdf:datatype='http://www.w3.org/2001/XMLSchema#anyURI'"/>
+    <x:expect label="$u creates an electronicLocator property of the TableOfContents" test="//bf:Work[1]/bf:tableOfContents[1]/bf:TableOfContents/bf:electronicLocator/@rdf:resource = 'https://stephenpaulus.com'"/>
   </x:scenario>
 
   <x:scenario label="506 - RESTRICTIONS ON ACCESS NOTE">

test/ConvSpec-841-887.xspec

@@ -13,8 +13,7 @@
   <x:scenario label="856 - ELECTRONIC LOCATION AND ACCESS">
     <x:scenario label="$3 = 'Table of Contents'">
       <x:context href="data/ConvSpec-841-887/marc.xml"/>
-      <x:expect label="856 with $3 = 'Table of Contents' generates a tableOfContents property of the Work" test="//bf:Work[@rdf:about='http://example.org/1#Work']/bf:tableOfContents/bf:TableOfContents/rdf:value='http://www.loc.gov/catdir/toc/onix07/93048623.html'"/>
-      <x:expect label="...with xs:anyURI datatype" test="//bf:Work[@rdf:about='http://example.org/1#Work']/bf:tableOfContents/bf:TableOfContents/rdf:value/@rdf:datatype='http://www.w3.org/2001/XMLSchema#anyURI'"/>
+      <x:expect label="856 with $3 = 'Table of Contents' generates a tableOfContents property of the Work" test="//bf:Work[@rdf:about='http://example.org/1#Work']/bf:tableOfContents/@rdf:resource='http://www.loc.gov/catdir/toc/onix07/93048623.html'"/>
     </x:scenario>
     <x:scenario label="If ind1 = 2">
       <x:context href="data/ConvSpec-841-887/marc.xml"/>

test/marc2bibframe2.xspec

@@ -909,11 +909,7 @@
                 </bf:relatedTo>
               </bflc:Relationship>
             </bflc:relationship>
-            <bf:tableOfContents>
-              <bf:TableOfContents>
-                <rdf:value rdf:datatype="http://www.w3.org/2001/XMLSchema#anyURI">http://www.loc.gov/catdir/toc/onix07/93048623.html</rdf:value>
-              </bf:TableOfContents>
-            </bf:tableOfContents>
+            <bf:tableOfContents rdf:resource="http://www.loc.gov/catdir/toc/onix07/93048623.html" />
       <bf:hasInstance rdf:resource="http://example.org/4417401#Instance"/>
           </bf:Work>
           <bf:Instance rdf:about="http://example.org/4417401#Instance">