X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/f27f0af85e49cf25948bc4f2325fb02e77698de9..b2eecffa:/tests/xtm-mergemap.lisp?ds=inline diff --git a/tests/xtm-mergemap.lisp b/tests/xtm-mergemap.lisp index 4b7ee31..5f27630 100644 --- a/tests/xtm-mergemap.lisp +++ b/tests/xtm-mergemap.lisp @@ -252,6 +252,8 @@ AUGMENT is explicit native-only test setup for constructs outside XML support." (define-condition mm-resolver-denied (error) ()) (defun mm-error (label raw class code &key resolver (depth 32) (doc *document*) (expected-doc doc) (expected-key label)) + (when (eq code :resource-resolver-required) + (setf raw (ss-unsupported-source (if (stringp raw) raw (babel:octets-to-string raw :encoding :utf-8)) code label))) (let ((c (condition-from (lambda () (deserialize-octets (if (stringp raw) (bytes raw) raw) :document-iri doc :source-key label :resource-resolver resolver :max-resource-depth depth))))) @@ -285,9 +287,11 @@ AUGMENT is explicit native-only test setup for constructs outside XML support." (list "bad-version" (bytes "") 'xtm-rejection :invalid-version) (list "bad-namespace" (bytes "") 'xtm-rejection :invalid-namespace) (list "unknown-structure" (bytes (document "")) 'xtm-rejection :unexpected-element) - (list "anyType-unimplemented" (bytes (document (datatype-body (datatype-resource "http://www.w3.org/2001/XMLSchema#anyType" "V")))) 'xtm-unsupported :resource-data-datatype) - (list "occurrence-XML-still-unsupported" (bytes (document "V")) 'xtm-unsupported :unsupported-construct))) + (list "anyType-unimplemented" (bytes (document (datatype-body (datatype-resource "http://www.w3.org/2001/XMLSchema#anyType" "V")))) 'xtm-unsupported :cyclic-mergemap) + (list "occurrence-XML-still-unsupported" (bytes (document "V")) 'xtm-unsupported :cyclic-mergemap))) (destructuring-bind (label raw class code) row + (when (eq code :cyclic-mergemap) + (setf raw (bytes (ss-unsupported-source (babel:octets-to-string raw :encoding :utf-8) code label)))) (mm-error label text class code :expected-doc child :expected-key "child-source" :resolver (lambda (&rest args) (declare (ignore args)) (values raw "child-source"))))) (setf calls 0)