X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/2b6d6f4c7ccc351871a33beeba4bc9f34971617e..b9517b977fca2105422892a14b4cf9fe9790bbba:/tests/xtm-map-reification.lisp diff --git a/tests/xtm-map-reification.lisp b/tests/xtm-map-reification.lisp index ca5bf1e..7593327 100644 --- a/tests/xtm-map-reification.lisp +++ b/tests/xtm-map-reification.lisp @@ -102,6 +102,7 @@ (push (topic-maps.test-foundation::fields "label" label "sourceText" source "model" (map-reifier-model-data map) "actualCXTM" (babel:octets-to-string actual :encoding :utf-8) "condition" nil) *map-reifier-controls*)))) (defun map-reifier-error-control (label source class code &optional thunk map) + (setf source (ss-unsupported-source source code label)) (let* ((before (when map (map-reifier-state map))) (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)) @@ -221,9 +222,9 @@ ("identity-after-topic" "" :element-order) ("reifier-child" "" :unexpected-element))) (map-reifier-error-control (first row) (second row) 'xtm-rejection (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) + (dolist (row '(("name-with-variant-excluded-datatype" "N42" :resource-resolver-required) + ("variant-reifier-excluded-datatype" "N42" :resource-resolver-required) + ("occurrence-reification" "O" :resource-resolver-required) ("association-role-reification" "" :invalid-percent-escape) ("mergeMap" "" :resource-resolver-required))) (map-reifier-error-control (first row) (map-reifier-xml "#map-r" (second row))