X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/topic-maps.git/blobdiff_plain/437ad53ea7539d36db3fa871d0931650b7a6a03e..refs/heads/codex/xtm-slice-22s:/tests/ctm-occurrences.lisp?ds=sidebyside diff --git a/tests/ctm-occurrences.lisp b/tests/ctm-occurrences.lisp index 156de27..9ad2593 100644 --- a/tests/ctm-occurrences.lisp +++ b/tests/ctm-occurrences.lisp @@ -127,10 +127,9 @@ ("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:*x." ctm-rejection :invalid-occurrence-literal 4) ("a t: 42x." ctm-rejection :invalid-occurrence-literal 5) - ("a t:\"x\"^^." ctm-unsupported :typed-literal 7) ("a t:\"x\"^^datatype." ctm-rejection :expected-datatype-iri 9) ("a t:\"x\"^." ctm-rejection :invalid-datatype-marker 7) ("a ex:t: \"x\"." undefined-prefix :undefined-prefix 2) @@ -142,8 +141,15 @@ (and (typep condition class) (eq code (error-code condition)) (= position (error-position condition)) (= 1 (error-line condition)) (= (1+ position) (error-column condition))))))) - (dolist (text '("a t:\"x\" @theme." "a t:\"x\" ~reifier." "a t: 2000-12-31." "a t: 2000-12-31T12:00:00Z." "a t:* .")) - (check (concatenate 'string "excluded-occurrence-feature:" text) (typep (ctm-condition text) 'ctm-unsupported)))) + (check "explicit-string-datatype-now-supported" + (string= (topic-maps.tmdm:string-datatype) + (topic-maps.tmdm:occurrence-datatype + (first (all-occurrences (read-text "a t:\"x\"^^.")))))) + (check "scoped-occurrence-now-deserialized" + (= 1 (length (topic-maps.tmdm:occurrence-scope + (first (all-occurrences (read-text "a t:\"x\" @theme."))))))) + (dolist (text '("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 "occurrence-feature-boundary:" text) (if (or (find #\~ text) (find #\* text)) (null (ctm-condition text)) (typep (ctm-condition text) 'ctm-unsupported))))) (defun occurrence-api-tests () (let* ((map (read-text "a. t.")) (a (local-topic map "a")) (type (local-topic map "t")) @@ -164,15 +170,22 @@ (not (member "corrupted" (topic-maps.tmdm:occurrence-item-identifiers first) :test #'string=))))) (let ((state (map-state map))) (loop for fixture in (list (list :foreign-type (lambda () (topic-maps.tmdm:add-occurrence a (first-topic (read-text "other.")) "x"))) - (list :unsupported-datatype (lambda () (topic-maps.tmdm:add-occurrence a type "42" :datatype "http://www.w3.org/2001/XMLSchema#integer"))) + (list :invalid-datatype (lambda () (topic-maps.tmdm:add-occurrence a type "42" :datatype "relative-datatype"))) (list :relative-uri-value (lambda () (topic-maps.tmdm:add-occurrence a type "file.html" :datatype (topic-maps.tmdm:iri-datatype)))) (list :duplicate-item-identifier (lambda () (topic-maps.tmdm:add-occurrence a type "Different" :item-identifiers '("urn:o:1")))) (list :duplicate-item-identifier (lambda () (topic-maps.tmdm:intern-topic map :item-identifier "urn:o:1"))) - (list :duplicate-item-identifier (lambda () (topic-maps.tmdm:add-topic-identifier a :item-identifier "urn:o:1"))) - (list :unsupported-reification-identity (lambda () (topic-maps.tmdm:intern-topic map :subject-identifier "urn:o:1")))) for fixture-index from 0 do + (list :duplicate-item-identifier (lambda () (topic-maps.tmdm:add-topic-identifier a :item-identifier "urn:o:1")))) for fixture-index from 0 do (check (format nil "invalid-occurrence-api:~A:~D" (first fixture) fixture-index) (eq (first fixture) (topic-maps.tmdm:occurrence-error-code (occurrence-condition (second fixture))))) (check (format nil "invalid-occurrence-api-atomic:~A:~D" (first fixture) (length *checks*)) (equal state (map-state map)))))) + (let* ((map (read-text "a. t.")) (a (local-topic map "a")) (type (local-topic map "t")) + (o (topic-maps.tmdm:add-occurrence a type "x" :item-identifiers '("urn:overlap"))) + (subject (topic-maps.tmdm:intern-topic map :subject-identifier "urn:overlap"))) + (check "occurrence-SI-II-overlap-does-not-reify" (and (null (topic-maps.tmdm:item-reifier o)) + (null (topic-maps.tmdm:topic-reified subject)))) + (check "occurrence-SI-II-overlap-preserves-distinct-properties" + (and (equal '("urn:overlap") (topic-maps.tmdm:occurrence-item-identifiers o)) + (equal '("urn:overlap") (topic-subject-identifiers subject)) (null (topic-item-identifiers subject))))) (let* ((map (read-text "a. t.")) (a (local-topic map "a")) (type (local-topic map "t"))) (topic-maps.tmdm:add-occurrence a type "urn:same") (topic-maps.tmdm:add-occurrence a type "urn:same" :datatype (topic-maps.tmdm:iri-datatype)) @@ -258,13 +271,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))) - ;; Private malformed/unsupported fixtures cannot be built by the public API. + (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 ()