X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/1c0b92c68fe1114b926d4405b553dfb096d2f425..refs/heads/codex/project-work-slice-22u:/tests/xtm-variants.lisp?ds=inline diff --git a/tests/xtm-variants.lisp b/tests/xtm-variants.lisp index d3b2461..dbba2cd 100644 --- a/tests/xtm-variants.lisp +++ b/tests/xtm-variants.lisp @@ -173,7 +173,7 @@ "sourceText" (document body) "model" (variant-model-data map) "actualCXTM" (babel:octets-to-string actual :encoding :utf-8)) *variant-controls*)))) (defun variant-error-control (label body class code) - (let* ((key (concatenate 'string "variant-syntax:" label)) (source (document body)) + (let* ((key (concatenate 'string "variant-syntax:" label)) (source (ss-unsupported-source (document body) code label)) (c (condition-from (lambda () (deserialize-octets (bytes source) :document-iri *document* :source-key key))))) (check (concatenate 'string key ":class-code") (and (eq class (type-of c)) (eq code (cond ((typep c 'topic-maps.xtm:xtm-error) (error-code c)) @@ -333,11 +333,11 @@ ("bad-href" "V" :invalid-topic-ref) ("resourceRef-missing-href" "" :missing-attribute))) (variant-error-control (first row) (format nil "N~A" (second row)) 'xtm-rejection (third row))) - (dolist (row '(("resourceData-integer" "42" :resource-data-datatype) - ("reified-itemIdentity-excluded-datatype" "42" :resource-data-datatype) - ("reifier-excluded-datatype" "42" :resource-data-datatype) - ("datatype" "V" :resource-data-datatype) - ("embedded-XML" "V" :resource-data-markup))) + (dolist (row '(("resourceData-anyType" "42" :resource-resolver-required) + ("reified-itemIdentity-excluded-datatype" "42" :resource-resolver-required) + ("reifier-excluded-datatype" "42" :resource-resolver-required) + ("datatype" "V" :resource-resolver-required) + ("embedded-XML" "V" :resource-resolver-required))) (variant-error-control (first row) (format nil "N~A" (second row)) 'xtm-unsupported (third row)))) (defun variant-tests ()