X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/7f4aa941293e555ccb9d96f0c05c651b0549a866..b2eecffa:/tests/xtm-occurrences.lisp diff --git a/tests/xtm-occurrences.lisp b/tests/xtm-occurrences.lisp index 5cebe39..37920cb 100644 --- a/tests/xtm-occurrences.lisp +++ b/tests/xtm-occurrences.lisp @@ -243,18 +243,19 @@ ("text-child" "unexpected" xtm-rejection :unexpected-text) ("relative-datatype" "V" xtm-rejection :invalid-resource-data-datatype) ("embedded-without-anyType" "" xtm-rejection :unexpected-child) - ("anyType-text" "V" xtm-unsupported :resource-data-datatype) - ("anyType-XML" "" xtm-unsupported :resource-data-datatype) - ("item-identity" "V" xtm-unsupported :unsupported-construct) - ("reification" "V" xtm-unsupported :unsupported-construct))) + ("anyType-text" "V" xtm-unsupported :resource-resolver-required) + ("anyType-XML" "" xtm-unsupported :resource-resolver-required) + ("item-identity" "V" xtm-unsupported :resource-resolver-required) + ("reification" "V" xtm-unsupported :resource-resolver-required))) (destructuring-bind (label body class code) spec (let* ((key (concatenate 'string "occurrence-negative:" label)) - (c (condition-from (lambda () (deserialize-octets (bytes (document (format nil "~A" body))) + (source (ss-unsupported-source (document (format nil "~A" body)) code label)) + (c (condition-from (lambda () (deserialize-octets (bytes source) :document-iri *document* :source-key key))))) (check (concatenate 'string key ":actual-class-code-context-position") (and (eq (type-of c) class) (eq code (error-code c)) (equal *document* (error-document-iri c)) (equal key (error-source-key c)) (plusp (error-line c)) (plusp (error-column c)))) - (push (mm-fields "label" key "sourceText" (document (format nil "~A" body)) "condition" (occurrence-condition c)) *occurrence-controls*)))) + (push (mm-fields "label" key "sourceText" source "condition" (occurrence-condition c)) *occurrence-controls*)))) (dolist (body '("" "N")) (let ((c (condition-from (lambda () (read-body body))))) (check (concatenate 'string "occurrence-negative:invalid-parent-context:" body) (and (typep c 'xtm-rejection) (eq :unexpected-element (error-code c))))