X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/4d7adecb3c2d5df90579aa37dfa41128988cb56c..b5c5ea5cc84dd31104045d032c25880b8bd62839:/tests/xtm-variants.lisp
diff --git a/tests/xtm-variants.lisp b/tests/xtm-variants.lisp
index b323a1e..d3b2461 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
@@ -333,9 +333,9 @@
("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-anyURI" "urn:x" :resource-data-datatype)
- ("itemIdentity" "V" :unsupported-construct)
- ("reifier" "V" :reification)
+ (dolist (row '(("resourceData-integer" "42" :resource-data-datatype)
+ ("reified-itemIdentity-excluded-datatype" "42" :resource-data-datatype)
+ ("reifier-excluded-datatype" "42" :resource-data-datatype)
("datatype" "V" :resource-data-datatype)
("embedded-XML" "V" :resource-data-markup)))
(variant-error-control (first row) (format nil "N~A" (second row)) 'xtm-unsupported (third row))))