X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/d498716b1e30ca1ef2b5c124038b372851ccb731..49e4f2efb3df426d8ce249bc9b714bbd81323525:/tests/xtm-identity.lisp
diff --git a/tests/xtm-identity.lisp b/tests/xtm-identity.lisp
index 501e704..527d4e0 100644
--- a/tests/xtm-identity.lisp
+++ b/tests/xtm-identity.lisp
@@ -10,6 +10,22 @@
(defvar *cases* nil)
(defvar *outputs* nil)
(defvar *fixture* nil)
+(defvar *negative-outputs* nil)
+(defvar *negative-controls* nil)
+(defvar *name-outputs* nil)
+(defvar *name-controls* nil)
+(defvar *scope-outputs* nil)
+(defvar *scope-controls* nil)
+(defvar *iid-outputs* nil)
+(defvar *iid-controls* nil)
+(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)
(defun check (name truth)
(push name *checks*)
(unless truth (error "XTM test failed: ~A" name))
@@ -241,7 +257,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)
@@ -406,7 +422,7 @@
""
"]>"))
(rejection (concatenate 'string "doctype:" body) (concatenate 'string body (document "")) 'xtm-xml-error :doctype-forbidden))
- (dolist (spec '(("unsupported-name" "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)))
@@ -461,9 +477,10 @@
(setf *fixture* map)))
(defun run-tests ()
- (setf *checks* nil *fixture* 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)
(handler-case
- (progn (original-contracts) (result-classification-tests)
+ (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) (variant-merge-original-contract) (resource-ref-original-contracts) (resource-ref-tests) (uri-data-original-contract) (uri-data-tests) (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.
@@ -471,7 +488,9 @@
(when report (write-report report)))
(error condition)))
(check "checks:unique-test-names" (= (length *checks*) (length (remove-duplicates *checks* :test #'equal))))
- (format t "XTM-SUMMARY ~D PASS 0 FAIL; ~D original CXTM PASS; helper source PASS~%" (length *checks*) (length *cases*))
+ (format t "XTM-SUMMARY ~D PASS 0 FAIL; ~D original CXTM PASS; ~D negative originals PASS; helper source PASS~%"
+ (length *checks*) (count :valid *cases* :key #'topic-maps.test-foundation:test-case-category)
+ (count :invalid *cases* :key #'topic-maps.test-foundation:test-case-category))
(length *checks*))
(defun write-report (pathname)
@@ -480,14 +499,15 @@
(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 subset, 26 registered positive contracts only; no CTM Mergemap integration"
+ (fields "scope" "XTM 2.0 identity/Name/Scope/Item-Identity/Variant subset, 52 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)
"unsupported" (count :unsupported cases :key #'topic-maps.test-foundation:test-case-status)
"not-run" (count :not-run cases :key #'topic-maps.test-foundation:test-case-status))
- "otherCorpusInputs" (fields "positiveUnexecuted" (- (length (directory (corpus-path "xtm2/in/*.xtm"))) (length cases))
- "negativeUnregisteredUnexecuted" (length (directory (corpus-path "xtm2/invalid/*.xtm"))))
+ "otherCorpusInputs" (fields "positiveUnexecuted" (- (length (directory (corpus-path "xtm2/in/*.xtm"))) (count :valid cases :key #'topic-maps.test-foundation:test-case-category))
+ "negativeUnregisteredUnexecuted" (- (length (directory (corpus-path "xtm2/invalid/*.xtm")))
+ (count :invalid cases :key #'topic-maps.test-foundation:test-case-category)))
"checks" (array (reverse *checks*))
"cases" (array (loop for case in cases collect
(fields "id" (topic-maps.test-foundation:test-case-id case)
@@ -498,6 +518,22 @@
"helperSource" (fields "id" "ctm/in/mergemap-xtm.sub" "status" (if fixture "pass" "not-run") "topics" (when fixture (length (topic-map-topics fixture)))
"associations" (when fixture (length (topic-map-associations fixture))) "roles" 2
"ctmMergemapContract" "NOT-RUN; direct helper deserialization only")
+ "negativeOriginals" (array *negative-outputs*)
+ "negativeControls" (array *negative-controls*)
+ "nameOriginals" (array *name-outputs*)
+ "nameControls" (array *name-controls*)
+ "scopeOriginals" (array *scope-outputs*)
+ "scopeControls" (array *scope-controls*)
+ "nameItemIdentityOriginals" (array *iid-outputs*)
+ "nameItemIdentityControls" (array *iid-controls*)
+ "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*)
"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))