X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/437ad53ea7539d36db3fa871d0931650b7a6a03e..d024dc96ce091db06b9d09ea7c1ccb5f90b2886d:/tests/cxtm.lisp?ds=inline diff --git a/tests/cxtm.lisp b/tests/cxtm.lisp index ef5ea9b..5bed403 100644 --- a/tests/cxtm.lisp +++ b/tests/cxtm.lisp @@ -22,23 +22,29 @@ (handler-case (progn (funcall thunk) nil) (topic-maps.cxtm:cxtm-error (c) c))) (defun map-state (map) ;; Includes object handles, all forward links, raw stored references/sets. - (list (copy-list (topic-maps.tmdm::%topic-map-topics map)) + (list (topic-maps.tmdm:item-reifier map) (topic-maps.tmdm:item-identifiers map) + (copy-list (topic-maps.tmdm::%topic-map-topics map)) (copy-list (topic-maps.tmdm::%topic-map-associations map)) (loop for topic in (topic-map-topics map) collect (list topic (topic-maps.tmdm::%topic-forward topic) (topic-parent topic) (topic-item-identifiers topic) (topic-subject-identifiers topic) (topic-subject-locators topic) (loop for n in (topic-names topic) collect - (list n (topic-maps.tmdm::%topic-name-forward n) (topic-name-parent n) - (topic-name-type n) (topic-name-value n))) + (list n (topic-maps.tmdm:item-reifier n) (topic-maps.tmdm:item-identifiers n) (topic-maps.tmdm::%topic-name-forward n) (topic-name-parent n) + (topic-name-type n) (topic-name-value n) (copy-list (topic-maps.tmdm::%topic-name-scope n)) + (loop for v in (topic-maps.tmdm::%topic-name-variants n) collect + (list v (topic-maps.tmdm:item-reifier v) (topic-maps.tmdm:item-identifiers v) (topic-maps.tmdm::%variant-forward v) (topic-maps.tmdm::%variant-parent v) + (topic-maps.tmdm::%variant-value v) (topic-maps.tmdm::%variant-datatype v) + (copy-list (topic-maps.tmdm::%variant-scope v)))))) (loop for o in (topic-maps.tmdm:topic-occurrences topic) collect - (list o (topic-maps.tmdm::%occurrence-forward o) (topic-maps.tmdm:occurrence-parent o) + (list o (topic-maps.tmdm:item-reifier o) (topic-maps.tmdm::%occurrence-forward o) (topic-maps.tmdm:occurrence-parent o) (topic-maps.tmdm:occurrence-type o) (topic-maps.tmdm:occurrence-value o) - (topic-maps.tmdm:occurrence-datatype o) (topic-maps.tmdm:occurrence-item-identifiers o))))) + (topic-maps.tmdm:occurrence-datatype o) (topic-maps.tmdm:occurrence-item-identifiers o) + (copy-list (topic-maps.tmdm::%occurrence-scope o)))))) (loop for a in (topic-maps.tmdm:topic-map-associations map) collect - (list a (topic-maps.tmdm::%association-forward a) (topic-maps.tmdm:association-type a) - (topic-maps.tmdm:association-parent a) + (list a (topic-maps.tmdm:item-reifier a) (topic-maps.tmdm:item-identifiers a) (topic-maps.tmdm::%association-forward a) (topic-maps.tmdm:association-type a) + (topic-maps.tmdm:association-parent a) (copy-list (topic-maps.tmdm::%association-scope a)) (loop for r in (topic-maps.tmdm:association-roles a) collect - (list r (topic-maps.tmdm::%association-role-forward r) + (list r (topic-maps.tmdm:item-reifier r) (topic-maps.tmdm:item-identifiers r) (topic-maps.tmdm::%association-role-forward r) (topic-maps.tmdm:association-role-type r) (topic-maps.tmdm:association-role-player r) (topic-maps.tmdm:association-role-parent r))))))) (defun compare-cxtm-cases () @@ -237,6 +243,9 @@ (topic-maps.test-foundation::emit-json-value (topic-maps.test-foundation::fields "kind" "cxtm-byte-equality" "passed" (+ (length *last-cxtm-checks*) (length additional-checks)) "failed" 0 + "checkOutcomeInterpretation" "passed/failed count local assertions; contractCounts and case status report imported comparisons independently" + "contractCounts" (topic-maps.test-foundation::fields "pass" (count-if (lambda (r) (getf r :match)) *cxtm-results*) + "fail" (count-if-not (lambda (r) (getf r :match)) *cxtm-results*)) "checks" (topic-maps.test-foundation::json-array (append *last-cxtm-checks* additional-checks)) "cases" (topic-maps.test-foundation::json-array (loop for r in *cxtm-results* collect