X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/d034a8deafa7cf74b2264ea8a7bd5cc0950806bf..4d7adecb3c2d5df90579aa37dfa41128988cb56c:/tests/xtm-identity.lisp?ds=sidebyside
diff --git a/tests/xtm-identity.lisp b/tests/xtm-identity.lisp
index 84af015..89f757d 100644
--- a/tests/xtm-identity.lisp
+++ b/tests/xtm-identity.lisp
@@ -14,6 +14,16 @@
(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)
(defun check (name truth)
(push name *checks*)
(unless truth (error "XTM test failed: ~A" name))
@@ -245,7 +255,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 "Nurn:excluded") '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)
@@ -410,7 +420,7 @@
""
"]>"))
(rejection (concatenate 'string "doctype:" body) (concatenate 'string body (document "")) 'xtm-xml-error :doctype-forbidden))
- (dolist (spec '(("unsupported-name-scope" "Name" :unsupported-construct)
+ (dolist (spec '(("unsupported-name-variant-resourceData-datatype" "Nameurn:excluded" :resource-data-datatype)
("unsupported-occurrence" "v" :unsupported-construct)
("unsupported-association" "" :unsupported-construct)
("unsupported-mergemap" "" :unsupported-construct)))
@@ -465,10 +475,10 @@
(setf *fixture* map)))
(defun run-tests ()
- (setf *checks* nil *fixture* nil *negative-outputs* nil *negative-controls* nil *name-outputs* nil *name-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)
(handler-case
(progn (original-contracts) (negative-original-controls) (negative-original-contracts)
- (name-original-contracts) (name-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) (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.
@@ -487,7 +497,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 subset, 36 positive and seven cause-qualified negative original contracts; no CTM Mergemap integration"
+ (fields "scope" "XTM 2.0 identity/Name/Scope/Item-Identity/Variant subset, 51 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)
@@ -510,6 +520,16 @@
"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*)
"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))