X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/3924d1eac5a070fe5a6a26683e23ac338793f544..6a2f8446afca0915882f0d4a06cb891ccfcdc96d:/tests/ctm-occurrences.lisp diff --git a/tests/ctm-occurrences.lisp b/tests/ctm-occurrences.lisp index ab7a588..9c794b1 100644 --- a/tests/ctm-occurrences.lisp +++ b/tests/ctm-occurrences.lisp @@ -127,8 +127,8 @@ ("a t: ;." ctm-rejection :expected-occurrence-value 5) ("a t \"x\"." ctm-rejection :expected-occurrence-type-separator 4) ("a t:\"x\" r:\"y\"." ctm-rejection :expected-separator 8) - ("a t: 42." ctm-unsupported :occurrence-literal-datatype 5) - ("a t:.5." ctm-unsupported :occurrence-literal-datatype 4) + ("a t: 2000-12-31T12:00:60+01:00." ctm-unsupported :datetime-leap-second-context 5) + ("a t:*." ctm-unsupported :occurrence-literal-datatype 4) ("a t: 42x." ctm-rejection :invalid-occurrence-literal 5) ("a t:\"x\"^^datatype." ctm-rejection :expected-datatype-iri 9) ("a t:\"x\"^." ctm-rejection :invalid-datatype-marker 7) @@ -145,7 +145,7 @@ (string= (topic-maps.tmdm:string-datatype) (topic-maps.tmdm:occurrence-datatype (first (all-occurrences (read-text "a t:\"x\"^^.")))))) - (dolist (text '("a t:\"x\" @theme." "a t:\"x\" ~reifier." "a t: 2000-12-31." "a t: 2000-12-31T12:00:00Z." "a t:* .")) + (dolist (text '("a t:\"x\" @theme." "a t:\"x\" ~reifier." "a t: 2000-12-31T12:00:60+01:00." "a t: 2000-12-31T12:00:60-01:00." "a t:* .")) (check (concatenate 'string "excluded-occurrence-feature:" text) (typep (ctm-condition text) 'ctm-unsupported)))) (defun occurrence-api-tests () @@ -261,13 +261,13 @@ (check "occurrence-lexical-string-not-rewritten-by-nfc" (and (string= value (topic-maps.tmdm:occurrence-value o)) (equal state (map-state map))))) (let* ((map (read-text "a. t.")) (a (local-topic map "a")) (type (local-topic map "t")) - (bad (topic-maps.tmdm::%make-occurrence "42" "http://www.w3.org/2001/XMLSchema#integer" type a))) + (bad (topic-maps.tmdm::%make-occurrence "42" "http://www.w3.org/2001/XMLSchema#dateTime" type a))) ;; Private fixture verifies the canonicalizer independently of the reader. (setf (topic-maps.tmdm::%topic-occurrences a) (list bad)) (let ((state (map-state map)) (condition (cxtm-condition (lambda () (cxtm map))))) - (check "unsupported-occurrence-datatype-not-silently-serialized" - (and (typep condition 'topic-maps.cxtm:cxtm-unsupported) - (eq :unsupported-occurrence-datatype (topic-maps.cxtm:error-code condition)))) + (check "invalid-datetime-not-silently-serialized" + (and (typep condition 'topic-maps.cxtm:cxtm-error) (not (typep condition 'topic-maps.cxtm:cxtm-unsupported)) + (eq :invalid-datetime-value (topic-maps.cxtm:error-code condition)))) (check "unsupported-occurrence-canonicalization-is-pure" (equal state (map-state map)))))) (defun run-occurrence-tests ()