X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/39c125bf9d462f538403aa633c56054511c210da..b5c5ea5cc84dd31104045d032c25880b8bd62839:/tests/xtm-identity.lisp diff --git a/tests/xtm-identity.lisp b/tests/xtm-identity.lisp index 3319d27..1c8bb07 100644 --- a/tests/xtm-identity.lisp +++ b/tests/xtm-identity.lisp @@ -21,6 +21,20 @@ (defvar *variant-outputs* nil) (defvar *variant-negative-outputs* nil) (defvar *variant-controls* nil) +(defvar *variant-merge-outputs* nil) +(defvar *resource-ref-outputs* nil) +(defvar *resource-ref-controls* nil) +(defvar *uri-data-outputs* nil) +(defvar *uri-data-controls* nil) +(defvar *variant-iid-outputs* nil) +(defvar *variant-iid-controls* nil) +(defvar *map-reifier-outputs* nil) +(defvar *map-reifier-controls* nil) +(defvar *name-reifier-outputs* nil) +(defvar *name-reifier-controls* nil) +(defvar *name-followup-outputs* nil) +(defvar *variant-reifier-outputs* nil) +(defvar *variant-reifier-controls* nil) (defun check (name truth) (push name *checks*) (unless truth (error "XTM test failed: ~A" name)) @@ -252,7 +266,7 @@ (dolist (spec (list (list "xml" "" 'xtm-xml-error :fail) (list "xtm" (document "") 'xtm-rejection :fail) (list "tmdm" (document "") 'item-identifier-error :fail) - (list "unsupported" (document "N") 'xtm-unsupported :unsupported))) + (list "unsupported" (document "N42") 'xtm-unsupported :unsupported))) (let ((case (case-record)) (c (condition-from (lambda () (deserialize-octets (bytes (second spec)) :document-iri *document*))))) (record-original-result case nil #() c) @@ -417,12 +431,12 @@ "" "]>")) (rejection (concatenate 'string "doctype:" body) (concatenate 'string body (document "")) 'xtm-xml-error :doctype-forbidden)) - (dolist (spec '(("unsupported-name-variant-resourceRef" "Name" :unsupported-construct) + (dolist (spec '(("unsupported-name-variant-resourceData-datatype" "Name42" :resource-data-datatype) ("unsupported-occurrence" "v" :unsupported-construct) ("unsupported-association" "" :unsupported-construct) ("unsupported-mergemap" "" :unsupported-construct))) (rejection (first spec) (document (second spec)) 'xtm-unsupported (third spec))) - (rejection "unsupported-reifier" "" 'xtm-unsupported :reification) + (rejection "unsupported-occurrence-reifier" (document "O") 'xtm-unsupported :unsupported-construct) (let ((c (condition-from (lambda () (read-body (format nil "~%~%")))))) (check "diagnostic:multiline-observed-position" (and (typep c 'xtm-rejection) (= 3 (error-line c)) (plusp (error-column c))))) (dolist (iri '(nil "relative.xtm" "https://example.test/a#fragment")) @@ -472,10 +486,10 @@ (setf *fixture* map))) (defun run-tests () - (setf *checks* nil *fixture* nil *negative-outputs* nil *negative-controls* nil *name-outputs* nil *name-controls* nil *scope-outputs* nil *scope-controls* nil *iid-outputs* nil *iid-controls* nil *variant-outputs* nil *variant-negative-outputs* nil *variant-controls* nil) + (setf *checks* nil *fixture* nil *negative-outputs* nil *negative-controls* nil *name-outputs* nil *name-controls* nil *scope-outputs* nil *scope-controls* nil *iid-outputs* nil *iid-controls* nil *variant-outputs* nil *variant-negative-outputs* nil *variant-controls* nil *variant-merge-outputs* nil *resource-ref-outputs* nil *resource-ref-controls* nil *uri-data-outputs* nil *uri-data-controls* nil *variant-iid-outputs* nil *variant-iid-controls* nil *map-reifier-outputs* nil *map-reifier-controls* nil *name-reifier-outputs* nil *name-reifier-controls* nil *name-followup-outputs* nil *variant-reifier-outputs* nil *variant-reifier-controls* nil) (handler-case (progn (original-contracts) (negative-original-controls) (negative-original-contracts) - (name-original-contracts) (name-tests) (scope-original-contracts) (scope-tests) (iid-original-contracts) (iid-tests) (variant-original-contracts) (variant-negative-original) (variant-tests) (result-classification-tests) + (name-original-contracts) (name-tests) (scope-original-contracts) (scope-tests) (iid-original-contracts) (iid-tests) (variant-original-contracts) (variant-negative-original) (variant-tests) (variant-merge-original-contract) (resource-ref-original-contracts) (resource-ref-tests) (uri-data-original-contract) (uri-data-tests) (variant-iid-original-contracts) (variant-iid-tests) (map-reifier-original-contract) (map-reifier-tests) (name-reifier-original-contracts) (name-reifier-tests) (name-reifier-followup-original-contracts) (variant-reifier-original-contracts) (variant-reifier-tests) (variant-reifier-followup-original-contract) (result-classification-tests) (semantic-tests) (identity-cascade-tests) (negative-tests) (helper-source-test)) (error (condition) ;; Preserve the actual failed outcome before ASDF propagates the failure. @@ -494,7 +508,7 @@ (array (items) (coerce items 'vector))) (with-open-file (out pathname :direction :output :if-exists :supersede :external-format :utf-8) (topic-maps.test-foundation::emit-json-value - (fields "scope" "XTM 2.0 identity/Name/Scope/Item-Identity/Variant subset, 48 positive and eight cause-qualified negative original contracts; no CTM Mergemap integration" + (fields "scope" "XTM 2.0 identity/Name/Scope/Item-Identity/Variant/Reification subset, 63 positive and eight cause-qualified negative original contracts; no CTM Mergemap integration" "corpusCommit" "cd165b150176c1d6842b37be9cc9051b40d4996b" "statuses" (fields "pass" (count :pass cases :key #'topic-maps.test-foundation:test-case-status) "fail" (count :fail cases :key #'topic-maps.test-foundation:test-case-status) @@ -524,6 +538,20 @@ "variantOriginals" (array *variant-outputs*) "variantNegativeOriginals" (array *variant-negative-outputs*) "variantControls" (array *variant-controls*) + "variantMergeOriginals" (array *variant-merge-outputs*) + "variantResourceRefOriginals" (array *resource-ref-outputs*) + "variantResourceRefControls" (array *resource-ref-controls*) + "variantResourceDataURIOriginals" (array *uri-data-outputs*) + "variantResourceDataURIControls" (array *uri-data-controls*) + "variantItemIdentityOriginals" (array *variant-iid-outputs*) + "variantItemIdentityControls" (array *variant-iid-controls*) + "mapReifierOriginals" (array *map-reifier-outputs*) + "mapReifierControls" (array (reverse *map-reifier-controls*)) + "nameReifierOriginals" (array *name-reifier-outputs*) + "nameReifierControls" (array (reverse *name-reifier-controls*)) + "nameFollowupOriginals" (array *name-followup-outputs*) + "variantReifierOriginals" (array *variant-reifier-outputs*) + "variantReifierControls" (array (reverse *variant-reifier-controls*)) "actualAndExpected" (array (loop for (id actual expected model condition source-length) in *outputs* collect (fields "id" id "actual" (when actual (babel:octets-to-string actual :encoding :utf-8)) "expected" (babel:octets-to-string expected :encoding :utf-8) "byteLength" (when actual (length actual))