X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/17dd58775e25ab495e3c83deb4b5a36f5e5a124b..2ad41cd1a945a4ce97824464de40646bb899259e:/tests/ctm-prefixes.lisp diff --git a/tests/ctm-prefixes.lisp b/tests/ctm-prefixes.lisp index c4e762e..d5977c7 100644 --- a/tests/ctm-prefixes.lisp +++ b/tests/ctm-prefixes.lisp @@ -167,13 +167,15 @@ (check "explicit-anyuri-cxtm-locator-rule" (search "#z" (cxtm map)))) (dolist (name '("integer" "decimal" "date" "dateTime")) (let* ((dt (concatenate 'string "http://www.w3.org/2001/XMLSchema#" name)) - (map (read-text (format nil "a t:\"00042\"^^<~A>." dt))) (o (first (all-occurrences map))) + (value (if (equal name "date") "2000-01-01" "00042")) + (map (read-text (format nil "a t:\"~A\"^^<~A>." value dt))) (o (first (all-occurrences map))) (state (map-state map)) (c (cxtm-condition (lambda () (cxtm map))))) (check (concatenate 'string "excluded-normalization-model-preserves:" name) - (and (string= dt (topic-maps.tmdm:occurrence-datatype o)) (string= "00042" (topic-maps.tmdm:occurrence-value o)))) - (if (string= name "integer") - (check "integer-explicit-cxtm-now-supported" - (and (null c) (search "42" (cxtm map)) (equal state (map-state map)))) + (and (string= dt (topic-maps.tmdm:occurrence-datatype o)) (string= value (topic-maps.tmdm:occurrence-value o)))) + (if (member name '("integer" "decimal" "date") :test #'string=) + (check (concatenate 'string name "-explicit-cxtm-now-supported") + (and (null c) (search (cond ((string= name "integer") "42") ((string= name "decimal") "42.0") (t "2000-01-01")) + (cxtm map)) (equal state (map-state map)))) (check (concatenate 'string "excluded-normalization-explicit-cxtm-unsupported:" name) (and (typep c 'topic-maps.cxtm:cxtm-unsupported) (eq :unsupported-occurrence-datatype (topic-maps.cxtm:error-code c)) (equal state (map-state map))))))) (let* ((map (read-text "%prefix xsd a t:\"Same\"; t:\"Same\"^^xsd:string.")))