X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/aeebbc7c6fdbf26642db0b7b5a358a3d04d62cca..refs/heads/codex/xtm-slice-22r:/tests/xtm-mergemap.lisp?ds=sidebyside diff --git a/tests/xtm-mergemap.lisp b/tests/xtm-mergemap.lisp index 31c28df..79d517c 100644 --- a/tests/xtm-mergemap.lisp +++ b/tests/xtm-mergemap.lisp @@ -286,7 +286,7 @@ AUGMENT is explicit native-only test setup for constructs outside XML support." (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 "occurrence-XML-still-unsupported" (bytes (document "V")) 'xtm-unsupported :resource-data-datatype))) (destructuring-bind (label raw class code) row (mm-error label text class code :expected-doc child :expected-key "child-source" :resolver (lambda (&rest args) (declare (ignore args)) (values raw "child-source"))))) @@ -376,7 +376,7 @@ AUGMENT is explicit native-only test setup for constructs outside XML support." (and (= 314 (length expected)) (not (equalp actual expected)) (equal without-map-metadata (babel:octets-to-string actual :encoding :utf-8)))) (check "mm-original:registered-status-remains-NOT-RUN" - (and (= 72 (length *cases*)) (null (find id *cases* :key #'topic-maps.test-foundation:test-case-id :test #'equal)))) + (null (find id *cases* :key #'topic-maps.test-foundation:test-case-id :test #'equal))) (push (mm-fields "id" id "documentIRI" *document* "sourceBytes" (length raw) "sourceHex" (format nil "~{~2,'0X~}" (coerce raw 'list)) "sourceText" (babel:octets-to-string raw :encoding :utf-8) "childIRI" child "childBytes" (length child-raw) "childHex" (format nil "~{~2,'0X~}" (coerce child-raw 'list)) @@ -394,7 +394,7 @@ AUGMENT is explicit native-only test setup for constructs outside XML support." :resolver (lambda (iri &rest args) (declare (ignore args)) (incf calls) (assert (equal child iri)) (values (file-bytes (corpus-path "xtm2/in/mergemap-loop.sub")) "xtm2/in/mergemap-loop.sub"))))) - (check "mm-original:cycle-finite-one-fetch-no-registration" (and (= 1 calls) (= 72 (length *cases*)))) + (check "mm-original:cycle-finite-one-fetch-no-registration" (and (= 1 calls) (null (find id *cases* :key #'topic-maps.test-foundation:test-case-id :test #'equal)))) (push (mm-fields "id" id "documentIRI" *document* "condition" (mm-condition c) "registeredStatus" "not-run" "registeredAsPASS" :false "normativeCycleDecision" nil "resolverCalls" calls) *mergemap-originals*))) (defun mergemap-tests ()