X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/341cfa2306788e2943bdf11ced5ee32a8ba74894..b2eecffa:/tests/ctm-registered-originals.lisp diff --git a/tests/ctm-registered-originals.lisp b/tests/ctm-registered-originals.lisp index c6f404c..66c9d99 100644 --- a/tests/ctm-registered-originals.lisp +++ b/tests/ctm-registered-originals.lisp @@ -86,6 +86,9 @@ (type (local map doc (if (equal name "occurrence-qname-value") "wikipedia" "occtype"))) (items (when owner (topic-occurrences owner))) (o (first items)) (expected (cond + ((equal name "occurrence-string-triple") (list "Occurrence \" Value" (string-datatype))) + ((equal name "occurrence-string-triple2") (list "Occurrence\"\" \" Value\"" (string-datatype))) + ((equal name "occurrence-ctm-integer") (list "*" "http://psi.topicmaps.org/iso13250/ctm-integer")) ((equal name "occurrence-decimal-dot-neg2") (list "-0.03" (decimal-datatype))) ((equal name "occurrence-decimal-dot-pos") (list "0.3" (decimal-datatype))) ((equal name "occurrence-decimal-leading-zeros2") (list "2.3" (decimal-datatype))) @@ -101,11 +104,15 @@ (equal expected (list (occurrence-value o) (occurrence-datatype o))) (null (occurrence-scope o)) (null (item-identifiers o))))) (:escapes - (let* ((owner (local map doc (cond ((equal name "string-escape") "topic") ((equal name "string-escape2") "A00") (t "zztop")))) + (let* ((owner (local map doc (cond ((equal name "string-escape") "topic") ((equal name "string-escape2") "A00") ((equal name "encoding-8859-5") "russia") (t "zztop")))) (names (when owner (topic-names owner))) (type (find-if (lambda (topic) (member (default-name-type-identifier) (topic-subject-identifiers topic) :test #'equal)) (topic-map-topics map))) (expected (cond ((equal name "string-escape") (list "\\" "Quote (\") character" (format nil "Some whitespace ~C~C~C" #\Newline #\Return #\Tab))) - ((equal name "string-escape2") '("A00")) (t '("ZZ Top"))))) + ((equal name "string-escape2") '("A00")) + ((equal name "encoding-8859-5") '("Россия")) + ((member name '("unicode-escape-u4-triple-string" "unicode-escape-u6-triple-string") :test #'equal) + (list (format nil "ZZ ~%Top"))) + (t '("ZZ Top"))))) (and owner type (= 2 (length (topic-map-topics map))) (null (topic-map-associations map)) (same-set expected (mapcar #'topic-name-value names)) (every (lambda (n) (and (eq owner (topic-name-parent n)) (eq type (topic-name-type n))