X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/b50a9d7950c5407b2ec02e1caccd76f73018b45f..27bf0dc4e2ab1e5afefcc616df8afdd73f815607:/tests/ctm-xtm-equivalence.lisp diff --git a/tests/ctm-xtm-equivalence.lisp b/tests/ctm-xtm-equivalence.lisp index 1706dbf..ca211a1 100644 --- a/tests/ctm-xtm-equivalence.lisp +++ b/tests/ctm-xtm-equivalence.lisp @@ -340,12 +340,6 @@ "The XTM Name has an extra II that CTM cannot express here. It is not removed for comparison."))) (defun gap-tests () (dolist (row (list - (list "occurrence-scope-reifier" "a t:\"42\"^^@s ~r." - (xml "42") - "occurrence" '("CTM 3.10" "XTM 4.15" "TMDM 5.6")) - (list "explicit-association" "rel(role: a)" - (xml "") - "association" '("CTM 3.13" "XTM 4.18-4.19" "TMDM 5.7-5.8")) (list "association-role-scope-reifiers" "rel(role: a ~rr)@s ~ar" (xml "") "association" '("CTM 3.3.9-3.3.10,3.13" "XTM 4.3.2,4.18-4.19" "TMDM 5.3.4,5.7-5.8")))) @@ -380,7 +374,19 @@ (let ((path (let ((prefix (uiop:getenv "TOPIC_MAPS_XTM_MERGEMAP_REPORT"))) (when prefix (concatenate 'string prefix ".equivalence.json"))))) (handler-case - (progn (mapc #'run-pair (pair-cases)) (contrast-tests) (gap-tests) + (progn (mapc #'run-pair (pair-cases)) + (run-pair (list :id "explicit-association" :ctm "rel(role: a)" + :xtm (xml "") + :keys '("rel" "role" "a") :counts '(3 0 0 0 1 1 0) + :why "CTM relation and explicit XTM association have the same type and one role with equal type/player, no scope or metadata." + :clauses '("CTM 3.13" "XTM 4.18-4.20" "TMDM 5.7-5.8,6.6-6.7"))) + (run-pair (list :id "occurrence-scope-reifier" + :ctm "a t:\"42\"^^@s ~r." + :xtm (xml "42") + :keys '("a" "t" "s" "r") :counts '(4 0 0 1 0 0 1) + :why "Both readers create the same typed scoped integer Occurrence and the same II-identified Reifier with inverse relation." + :clauses '("CTM 3.10" "XTM 4.3.2,4.15" "TMDM 5.3.4-5.3.5,5.6,6.5"))) + (contrast-tests) (gap-tests) (check "equivalence:unique-check-labels" (= (length topic-maps.xtm-mergemap.tests::*checks*) (length (remove-duplicates topic-maps.xtm-mergemap.tests::*checks* :test #'equal))))) @@ -388,6 +394,6 @@ (when path (write-report path c)) (error c))) (setf *checks* (reverse topic-maps.xtm-mergemap.tests::*checks*)) (when path (write-report path)) - (format t "CTM-XTM-EQUIVALENCE-PASS: ~D checks; ~D actual reader pairs; 3 contrasts; 3 explicit capability gaps.~%" - (length *checks*) (length (pair-cases))) + (format t "CTM-XTM-EQUIVALENCE-PASS: ~D checks; ~D actual reader pairs; 3 contrasts; 1 explicit capability gap.~%" + (length *checks*) (+ 2 (length (pair-cases)))) (length *checks*))))