X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/2ad41cd1a945a4ce97824464de40646bb899259e..6a2f8446afca0915882f0d4a06cb891ccfcdc96d:/tests/ctm-prefixes.lisp
diff --git a/tests/ctm-prefixes.lisp b/tests/ctm-prefixes.lisp
index d5977c7..e0cf351 100644
--- a/tests/ctm-prefixes.lisp
+++ b/tests/ctm-prefixes.lisp
@@ -167,17 +167,17 @@
(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))
- (value (if (equal name "date") "2000-01-01" "00042"))
+ (value (cond ((equal name "date") "2000-01-01") ((equal name "dateTime") "2000-01-01T00:00:00.1200Z") (t "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= 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)))))))
+ (check (concatenate 'string name "-explicit-cxtm-now-supported")
+ (and (null c) (search (cond ((string= name "integer") "42")
+ ((string= name "decimal") "42.0")
+ ((string= name "dateTime") "2000-01-01T00:00:00.12Z")
+ (t "2000-01-01")) (cxtm map))
+ (equal state (map-state map))))))
(let* ((map (read-text "%prefix xsd a t:\"Same\"; t:\"Same\"^^xsd:string.")))
(check "implicit-explicit-string-datatypes-have-identical-equality" (= 1 (length (all-occurrences map)))))
(let* ((value (concatenate 'string "<&>" (map 'string #'code-char '(101 769))))