X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/2ad41cd1a945a4ce97824464de40646bb899259e..6a2f8446afca0915882f0d4a06cb891ccfcdc96d:/tests/ctm-occurrences.lisp diff --git a/tests/ctm-occurrences.lisp b/tests/ctm-occurrences.lisp index bdf75f5..9c794b1 100644 --- a/tests/ctm-occurrences.lisp +++ b/tests/ctm-occurrences.lisp @@ -127,7 +127,7 @@ ("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: 2000-12-31T12:00:00." ctm-unsupported :occurrence-literal-datatype 5) + ("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) @@ -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-31T12:00:00." "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 () @@ -265,9 +265,9 @@ ;; 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 ()