X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/aeebbc7c6fdbf26642db0b7b5a358a3d04d62cca..b2eecffa:/tests/xtm-map-reification.lisp?ds=sidebyside
diff --git a/tests/xtm-map-reification.lisp b/tests/xtm-map-reification.lisp
index 1275bc8..7593327 100644
--- a/tests/xtm-map-reification.lisp
+++ b/tests/xtm-map-reification.lisp
@@ -102,6 +102,7 @@
(push (topic-maps.test-foundation::fields "label" label "sourceText" source "model" (map-reifier-model-data map)
"actualCXTM" (babel:octets-to-string actual :encoding :utf-8) "condition" nil) *map-reifier-controls*))))
(defun map-reifier-error-control (label source class code &optional thunk map)
+ (setf source (ss-unsupported-source source code label))
(let* ((before (when map (map-reifier-state map)))
(c (condition-from (or thunk (lambda () (deserialize-octets (bytes source) :document-iri *document* :source-key label)))))
(actual-code (cond ((typep c 'topic-maps.xtm:xtm-error) (error-code c))
@@ -221,12 +222,13 @@
("identity-after-topic" "" :element-order)
("reifier-child" "" :unexpected-element)))
(map-reifier-error-control (first row) (second row) 'xtm-rejection (third row)))
- (dolist (row '(("name-with-variant-excluded-datatype" "N42" :resource-data-datatype)
- ("variant-reifier-excluded-datatype" "N42" :resource-data-datatype)
- ("occurrence-reification" "O" :unsupported-construct)
- ("association-role-reification" "" :unsupported-construct)
+ (dolist (row '(("name-with-variant-excluded-datatype" "N42" :resource-resolver-required)
+ ("variant-reifier-excluded-datatype" "N42" :resource-resolver-required)
+ ("occurrence-reification" "O" :resource-resolver-required)
+ ("association-role-reification" "" :invalid-percent-escape)
("mergeMap" "" :resource-resolver-required)))
- (map-reifier-error-control (first row) (map-reifier-xml "#map-r" (second row)) 'xtm-unsupported (third row)))
+ (map-reifier-error-control (first row) (map-reifier-xml "#map-r" (second row))
+ (if (equal (first row) "association-role-reification") 'xtm-rejection 'xtm-unsupported) (third row)))
(map-reifier-error-control "map-ii-reifier-ii-collision" (map-reifier-xml "#r" "")
'item-identifier-error :duplicate-item-identifier)
(let* ((map (deserialize-octets (bytes (map-reifier-xml "#r" "N")) :document-iri *document*))