X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/d034a8deafa7cf74b2264ea8a7bd5cc0950806bf..6162ed68:/tests/xtm-negative-originals.lisp?ds=sidebyside
diff --git a/tests/xtm-negative-originals.lisp b/tests/xtm-negative-originals.lisp
index 0e7f5ab..e8eef43 100644
--- a/tests/xtm-negative-originals.lisp
+++ b/tests/xtm-negative-originals.lisp
@@ -16,11 +16,13 @@
(when c
(let* ((xtm (typep c 'topic-maps.xtm:xtm-error))
(identifier (typep c 'item-identifier-error))
- (code (cond (xtm (error-code c)) (identifier (item-identifier-error-code c)))))
+ (variant (typep c 'variant-error))
+ (code (cond (xtm (error-code c)) (identifier (item-identifier-error-code c)) (variant (variant-error-code c)))))
(topic-maps.test-foundation::fields
"class" (string (type-of c)) "code" (when code (string-downcase (string code)))
"detail" (cond (xtm (topic-maps.xtm:error-detail c))
- (identifier (topic-maps.tmdm::item-identifier-error-detail c)))
+ (identifier (topic-maps.tmdm::item-identifier-error-detail c))
+ (variant (topic-maps.tmdm::variant-error-detail c)))
"message" (princ-to-string c)
"line" (when xtm (error-line c)) "column" (when xtm (error-column c))
"positionUnit" (when xtm "approximate-SAX-line-column")
@@ -35,6 +37,14 @@
(equal (fourth spec) (topic-maps.xtm:error-detail c))
(eql (fifth spec) (error-line c)) (eql (sixth spec) (error-column c))
(equal iri (error-document-iri c)) (equal key (error-source-key c))))
+ ((typep c 'reification-error)
+ (and (eq (third spec) (reification-error-code c))
+ (equal (fourth spec) (topic-maps.tmdm::reification-error-detail c))
+ (null (fifth spec)) (null (sixth spec))))
+ ((typep c 'variant-error)
+ (and (eq (third spec) (variant-error-code c))
+ (equal (fourth spec) (topic-maps.tmdm::variant-error-detail c))
+ (null (fifth spec)) (null (sixth spec))))
((typep c 'topic-maps.tmdm::occurrence-identifier-error)
(and (eq (third spec) (item-identifier-error-code c))
(equal (fourth spec) (topic-maps.tmdm::item-identifier-error-detail c))
@@ -148,7 +158,7 @@
(dolist (row (list (list "accepted-is-fail" nil :fail)
(list "arbitrary-error-is-fail" (make-condition 'simple-error :format-control "local guard control") :fail)
(list "xml-error-is-fail" (condition-from (lambda () (read-body ""))) :fail)
- (list "unsupported-is-not-pass" (condition-from (lambda () (read-body "N"))) :unsupported)
+ (list "unsupported-is-not-pass" (condition-from (lambda () (read-body ""))) :unsupported)
(list "wrong-xtm-cause-is-fail" (condition-from (lambda () (read-body ""))) :fail)
(list "same-code-wrong-element-is-fail" (condition-from (lambda () (read-body ""))) :fail)))
(destructuring-bind (label c status) row