(c (condition-from (or thunk (lambda () (deserialize-octets (bytes source) :document-iri *document* :source-key label)))))
(actual-code (cond ((typep c 'topic-maps.xtm:xtm-error) (error-code c))
((typep c 'reification-error) (reification-error-code c))
- ((typep c 'item-identifier-error) (item-identifier-error-code c)))))
+ ((typep c 'item-identifier-error) (item-identifier-error-code c))
+ ((typep c 'variant-error) (variant-error-code c)))))
(push (topic-maps.test-foundation::fields "label" label "sourceText" source "expectedClass" (string class)
"expectedCode" (string-downcase (string code)) "condition" (map-reifier-condition-data c)
"atomicNativeOperation" (when map (if (equal before (map-reifier-state map)) :true :false))) *map-reifier-controls*)
("identity-after-topic" "<topicMap xmlns='http://www.topicmaps.org/xtm/' version='2.0' reifier='#r'><topic id='r'/><itemIdentity href='urn:map'/></topicMap>" :element-order)
("reifier-child" "<topicMap xmlns='http://www.topicmaps.org/xtm/' version='2.0'><reifier href='#r'/></topicMap>" :unexpected-element)))
(map-reifier-error-control (first row) (second row) 'xtm-rejection (third row)))
- (dolist (row '(("name-with-variant-reification" "<topic id='a'><name><value>N</value><variant reifier='#r'><scope><topicRef href='#v'/></scope><resourceData>V</resourceData></variant></name></topic>" :reification)
- ("variant-reification" "<topic id='a'><name><value>N</value><variant reifier='#v'><scope><topicRef href='#s'/></scope><resourceData>V</resourceData></variant></name></topic>" :reification)
- ("occurrence-reification" "<topic id='a'><occurrence reifier='#o'><type><topicRef href='#t'/></type><resourceData>O</resourceData></occurrence></topic>" :unsupported-construct)
- ("association-role-reification" "<association reifier='#a'><type><topicRef href='#t'/></type><role reifier='#r'><type><topicRef href='#rt'/></type><topicRef href='#p'/></role></association>" :unsupported-construct)
- ("mergeMap" "<mergeMap href='other.xtm'/>" :unsupported-construct)))
- (map-reifier-error-control (first row) (map-reifier-xml "#map-r" (second row)) 'xtm-unsupported (third row)))
+ (dolist (row '(("name-with-variant-excluded-datatype" "<topic id='a'><name><value>N</value><variant reifier='#r'><scope><topicRef href='#v'/></scope><resourceData datatype='http://www.w3.org/2001/XMLSchema#anyType'>42</resourceData></variant></name></topic>" :resource-data-datatype)
+ ("variant-reifier-excluded-datatype" "<topic id='a'><name><value>N</value><variant reifier='#v'><scope><topicRef href='#s'/></scope><resourceData datatype='http://www.w3.org/2001/XMLSchema#anyType'>42</resourceData></variant></name></topic>" :resource-data-datatype)
+ ("occurrence-reification" "<topic id='a'><occurrence reifier='#o'><type><topicRef href='#t'/></type><resourceData datatype='http://www.w3.org/2001/XMLSchema#anyType'>O</resourceData></occurrence></topic>" :resource-data-datatype)
+ ("association-role-reification" "<association reifier='#a'><type><topicRef href='#t'/></type><role reifier='#r%GG'><type><topicRef href='#rt'/></type><topicRef href='#p'/></role></association>" :invalid-percent-escape)
+ ("mergeMap" "<mergeMap href='other.xtm'/>" :resource-resolver-required)))
+ (map-reifier-error-control (first row) (map-reifier-xml "#map-r" (second row))
+ (if (equal (first row) "association-role-reification") 'xtm-rejection 'xtm-unsupported) (third row)))
(map-reifier-error-control "map-ii-reifier-ii-collision" (map-reifier-xml "#r" "<itemIdentity href='#r'/>")
'item-identifier-error :duplicate-item-identifier)
(let* ((map (deserialize-octets (bytes (map-reifier-xml "#r" "<topic id='owner'><name><value>N</value></name></topic>")) :document-iri *document*))