X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/437ad53ea7539d36db3fa871d0931650b7a6a03e..4f7b4d26d40f8f5566594aa2e3ad6296d44fc4c3:/tests/cxtm.lisp diff --git a/tests/cxtm.lisp b/tests/cxtm.lisp index ef5ea9b..5240356 100644 --- a/tests/cxtm.lisp +++ b/tests/cxtm.lisp @@ -29,14 +29,19 @@ (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))) + (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::%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) (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) + (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) (topic-maps.tmdm:association-role-type r) (topic-maps.tmdm:association-role-player r) @@ -237,6 +242,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