X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/c02207856f1927302ea064bc901e07183242f2da..refs/heads/codex/xtm-slice-22r:/tests/xtm-identity.lisp
diff --git a/tests/xtm-identity.lisp b/tests/xtm-identity.lisp
index 8fdc2a3..a91e0ff 100644
--- a/tests/xtm-identity.lisp
+++ b/tests/xtm-identity.lisp
@@ -6,11 +6,27 @@
(in-package #:topic-maps.xtm.tests)
(defparameter *document* "https://xtm-tests.example.invalid/cd165b150176c1d6842b37be9cc9051b40d4996b/xtm2/in/example.xtm")
+(defvar *cq-results* nil)
+(defvar *cq-native* nil)
+(defvar *cq-api* nil)
+(defvar *cr-results* nil)
+(defvar *cr-native* nil)
+(defvar *cr-controls* nil)
+(defvar *cr-executed* nil)
(defvar *occurrence-outputs* nil)
(defvar *occurrence-controls* nil)
(defvar *registered-mergemap-outputs* nil)
(defvar *association-outputs* nil)
(defvar *item-identity-outputs* nil)
+(defvar *role-reifier-native* nil)
+(defvar *role-reifier-outputs* nil)
+(defvar *role-reifier-controls* nil)
+(defvar *association-reifier-native* nil)
+(defvar *association-reifier-outputs* nil)
+(defvar *association-reifier-controls* nil)
+(defvar *occurrence-reifier-native* nil)
+(defvar *occurrence-reifier-outputs* nil)
+(defvar *occurrence-reifier-controls* nil)
(defvar *item-identity-controls* nil)
(defvar *association-controls* nil)
(defvar *mergemap-controls* nil)
@@ -443,11 +459,12 @@
"]>"))
(rejection (concatenate 'string "doctype:" body) (concatenate 'string body (document "")) 'xtm-xml-error :doctype-forbidden))
(dolist (spec '(("unsupported-name-variant-resourceData-datatype" "Name42" :resource-data-datatype)
- ("unsupported-occurrence" "v" :unsupported-construct)
- ("unsupported-association" "" :unsupported-construct)
+ ("unsupported-occurrence" "v" :resource-data-datatype)
+ ("unsupported-association" "" :invalid-percent-escape)
("unsupported-mergemap" "" :resource-resolver-required)))
- (rejection (first spec) (document (second spec)) 'xtm-unsupported (third spec)))
- (rejection "unsupported-occurrence-reifier" (document "O") 'xtm-unsupported :unsupported-construct)
+ (rejection (first spec) (document (second spec))
+ (if (equal (first spec) "unsupported-association") 'xtm-rejection 'xtm-unsupported) (third spec)))
+ (rejection "unsupported-occurrence-reifier" (document "O") 'xtm-unsupported :resource-data-datatype)
(let ((c (condition-from (lambda () (read-body (format nil "~%~%"))))))
(check "diagnostic:multiline-observed-position" (and (typep c 'xtm-rejection) (= 3 (error-line c)) (plusp (error-column c)))))
(dolist (iri '(nil "relative.xtm" "https://example.test/a#fragment"))
@@ -497,10 +514,12 @@
(setf *fixture* map)))
(defun run-tests ()
- (setf *item-identity-outputs* nil *item-identity-controls* nil *association-outputs* nil *association-controls* nil *registered-mergemap-outputs* nil *occurrence-outputs* nil *occurrence-controls* nil *mergemap-controls* nil *mergemap-originals* nil *datatype-outputs* nil *datatype-controls* nil *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 *variant-iid-outputs* nil *variant-iid-controls* nil *map-reifier-outputs* nil *map-reifier-controls* nil *name-reifier-outputs* nil *name-reifier-controls* nil *name-followup-outputs* nil *variant-reifier-outputs* nil *variant-reifier-controls* nil)
+ (setf *cr-results* nil *cr-native* nil *cr-controls* nil *cr-executed* nil)
+ (setf *cq-results* nil *cq-native* nil *cq-api* nil)
+ (setf *role-reifier-native* nil *role-reifier-outputs* nil *role-reifier-controls* nil *association-reifier-native* nil *association-reifier-outputs* nil *association-reifier-controls* nil *occurrence-reifier-native* nil *occurrence-reifier-outputs* nil *occurrence-reifier-controls* nil *item-identity-outputs* nil *item-identity-controls* nil *association-outputs* nil *association-controls* nil *registered-mergemap-outputs* nil *occurrence-outputs* nil *occurrence-controls* nil *mergemap-controls* nil *mergemap-originals* nil *datatype-outputs* nil *datatype-controls* nil *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 *variant-iid-outputs* nil *variant-iid-controls* nil *map-reifier-outputs* nil *map-reifier-controls* nil *name-reifier-outputs* nil *name-reifier-controls* nil *name-followup-outputs* nil *variant-reifier-outputs* nil *variant-reifier-controls* nil)
(handler-case
(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) (variant-iid-original-contracts) (variant-iid-tests) (map-reifier-original-contract) (map-reifier-tests) (name-reifier-original-contracts) (name-reifier-tests) (name-reifier-followup-original-contracts) (variant-reifier-original-contracts) (variant-reifier-tests) (variant-reifier-followup-original-contract) (datatype-original-contract) (datatype-tests) (mergemap-tests) (occurrence-original-contracts) (occurrence-tests) (registered-mergemap-original-contracts) (association-original-contracts) (association-tests) (item-identity-original-contracts) (item-identity-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) (uri-data-original-contract) (uri-data-tests) (variant-iid-original-contracts) (variant-iid-tests) (map-reifier-original-contract) (map-reifier-tests) (name-reifier-original-contracts) (name-reifier-tests) (name-reifier-followup-original-contracts) (variant-reifier-original-contracts) (variant-reifier-tests) (variant-reifier-followup-original-contract) (datatype-original-contract) (datatype-tests) (mergemap-tests) (occurrence-original-contracts) (occurrence-tests) (registered-mergemap-original-contracts) (association-original-contracts) (association-tests) (item-identity-original-contracts) (item-identity-tests) (orr-native-tests) (occurrence-reifier-original-contracts) (occurrence-reifier-tests) (arr-native-tests) (association-reifier-original-contracts) (association-reifier-tests) (rrr-native-tests) (role-reifier-original-contracts) (role-reifier-tests) (cq-tests) (cr-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.
@@ -569,6 +588,17 @@
"mergemapOriginalObservations" (array *mergemap-originals*)
"occurrenceOriginals" (array *occurrence-outputs*)
"occurrenceControls" (array *occurrence-controls*)
+ "c14nPreflight" (cq-feature-report)
+ "resourceDataC14N" (cr-feature-report)
+ "roleReifierNative" (array *role-reifier-native*)
+ "roleReifierOriginals" (array *role-reifier-outputs*)
+ "roleReifierControls" (array *role-reifier-controls*)
+ "associationReifierNative" (array *association-reifier-native*)
+ "associationReifierOriginals" (array *association-reifier-outputs*)
+ "associationReifierControls" (array *association-reifier-controls*)
+ "occurrenceReifierNative" (array *occurrence-reifier-native*)
+ "occurrenceReifierOriginals" (array *occurrence-reifier-outputs*)
+ "occurrenceReifierControls" (array *occurrence-reifier-controls*)
"itemIdentityOriginals" (array *item-identity-outputs*)
"itemIdentityControls" (array *item-identity-controls*)
"associationOriginals" (array *association-outputs*)