X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/da36095dddc1354ee8558dc9d729f5cb2fe53ff5..refs/heads/codex/xtm-slice-22s:/tests/xtm-variants.lisp?ds=sidebyside
diff --git a/tests/xtm-variants.lisp b/tests/xtm-variants.lisp
index d0788eb..dbba2cd 100644
--- a/tests/xtm-variants.lisp
+++ b/tests/xtm-variants.lisp
@@ -38,7 +38,7 @@
(topic-maps.test-foundation::fields "value" (variant-value v) "datatype" (variant-datatype v)
"parentName" (1+ (position (variant-parent v) names :test #'eq))
"scope" (coerce (mapcar (lambda (theme) (1+ (position theme topics :test #'eq))) (variant-scope v)) 'vector)
- "itemIdentifiers" (coerce (item-identifiers v) 'vector) "reifier" nil)) 'vector))))
+ "itemIdentifiers" (coerce (item-identifiers v) 'vector) "reifier" (when (item-reifier v) (1+ (position (item-reifier v) topics :test #'eq))))) 'vector))))
(defun variant-original-model-checks (spec map raw)
(destructuring-bind (id count name-scope-ids variant-scope-ids source-count) spec
@@ -173,7 +173,7 @@
"sourceText" (document body) "model" (variant-model-data map)
"actualCXTM" (babel:octets-to-string actual :encoding :utf-8)) *variant-controls*))))
(defun variant-error-control (label body class code)
- (let* ((key (concatenate 'string "variant-syntax:" label)) (source (document body))
+ (let* ((key (concatenate 'string "variant-syntax:" label)) (source (ss-unsupported-source (document body) code label))
(c (condition-from (lambda () (deserialize-octets (bytes source) :document-iri *document* :source-key key)))))
(check (concatenate 'string key ":class-code")
(and (eq class (type-of c)) (eq code (cond ((typep c 'topic-maps.xtm:xtm-error) (error-code c))
@@ -333,11 +333,11 @@
("bad-href" "V" :invalid-topic-ref)
("resourceRef-missing-href" "" :missing-attribute)))
(variant-error-control (first row) (format nil "N~A" (second row)) 'xtm-rejection (third row)))
- (dolist (row '(("resourceData-integer" "42" :resource-data-datatype)
- ("reified-itemIdentity" "V" :reification)
- ("reifier" "V" :reification)
- ("datatype" "V" :resource-data-datatype)
- ("embedded-XML" "V" :resource-data-markup)))
+ (dolist (row '(("resourceData-anyType" "42" :resource-resolver-required)
+ ("reified-itemIdentity-excluded-datatype" "42" :resource-resolver-required)
+ ("reifier-excluded-datatype" "42" :resource-resolver-required)
+ ("datatype" "V" :resource-resolver-required)
+ ("embedded-XML" "V" :resource-resolver-required)))
(variant-error-control (first row) (format nil "N~A" (second row)) 'xtm-unsupported (third row))))
(defun variant-tests ()