X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/6e7c8fc9f247a3e4419299caa7836366573c8c63..refs/heads/codex/xtm-slice-22r:/tests/xtm-map-reification.lisp
diff --git a/tests/xtm-map-reification.lisp b/tests/xtm-map-reification.lisp
index c75f251..ca5bf1e 100644
--- a/tests/xtm-map-reification.lisp
+++ b/tests/xtm-map-reification.lisp
@@ -106,7 +106,8 @@
(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*)
@@ -220,12 +221,13 @@
("identity-after-topic" "" :element-order)
("reifier-child" "" :unexpected-element)))
(map-reifier-error-control (first row) (second row) 'xtm-rejection (third row)))
- (dolist (row '(("name-reification" "N" :reification)
- ("variant-reification" "NV" :reification)
- ("occurrence-reification" "O" :unsupported-construct)
- ("association-role-reification" "" :unsupported-construct)
- ("mergeMap" "" :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" "N42" :resource-data-datatype)
+ ("variant-reifier-excluded-datatype" "N42" :resource-data-datatype)
+ ("occurrence-reification" "O" :resource-data-datatype)
+ ("association-role-reification" "" :invalid-percent-escape)
+ ("mergeMap" "" :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" "")
'item-identifier-error :duplicate-item-identifier)
(let* ((map (deserialize-octets (bytes (map-reifier-xml "#r" "N")) :document-iri *document*))