Changeset 316 for branches/new-datamodel/src/unit_tests

Timestamp:

09/27/10 20:26:49 (15 years ago)

Author:

lgiessmann

Message:

new-datamodel: adapted the unit-test exporter-test:test-fragments-xtm1.0-versions to the new data model; fixed a bug when creating FragmentC objects-> topics referenced by variants of the main topic are also added as topic stubs

File:

• branches/new-datamodel/src/unit_tests/exporter_xtm1.0_test.lisp (modified) (7 diffs)

branches/new-datamodel/src/unit_tests/exporter_xtm1.0_test.lisp ¶

@@ -391 +391 @@
                     return (identified-construct item)))
            (t100-start-revision (d::start-revision (first (d::versions t100)))))
-
       (d:get-fragments t100-start-revision)
       (let ((t100-fragment (loop for item in (elephant:get-instances-by-class 'FragmentC)
                               when (eq (topic item) t100)
                               return item)))
-
         (with-open-file (stream *out-xtm1.0-file* :direction :output)
           (write-string (export-xtm-fragment t100-fragment :xtm-format '1.0) stream))))
@@ -444 +442 @@
     (handler-case (delete-file *out-xtm1.0-file*)(error () )) ;deletes file - if exist
     (export-xtm *out-xtm1.0-file* :revision fixtures::revision1 :xtm-format '1.0)
-    (let ((document (dom:document-element (cxml:parse-file *out-xtm1.0-file* (cxml-dom:make-dom-builder))))
+    (let ((document
+           (dom:document-element
+            (cxml:parse-file *out-xtm1.0-file* (cxml-dom:make-dom-builder))))
           (t100-occurrences-resourceData (list "The ISO 19115 standard ..." "2003-01-01"))) ;local value->no type
       (check-document-structure document 47 7 :ns-uri *xtm1.0-ns*)
@@ -1122 +1122 @@
            (loop for item in (elephant:get-instances-by-class 'd:PersistentIdC)
               when (string= (uri item) new-t100-psi)
-              return (identified-construct item))))
+              return (identified-construct item :revision fixtures::revision3))))
       (d:get-fragments fixtures::revision3)
       (let ((fragment (loop for item in (elephant:get-instances-by-class 'd:FragmentC)
@@ -1129 +1129 @@
         (with-open-file (stream *out-xtm1.0-file* :direction :output)
           (write-string (export-xtm-fragment fragment :xtm-format '1.0) stream))))
-
     (let ((document
            (dom:document-element
             (cxml:parse-file *out-xtm1.0-file* (cxml-dom:make-dom-builder)))))
-      (check-document-structure document 6 0 :ns-uri *xtm1.0-ns*)
+      (check-document-structure document 9 1 :ns-uri *xtm1.0-ns*)
       (loop for topic across (xpath-child-elems-by-qname document *xtm1.0-ns* "topic")
          do (loop for subjectIndicatorRef across (xpath-child-elems-by-qname
@@ -1146 +1145 @@
                       ((string= href core-display-psi)
                        (check-topic-id topic))
+                      ((string= href constants:*type-instance-psi*)
+                       (check-topic-id topic))
+                      ((string= href constants:*type-psi*)
+                       (check-topic-id topic))
+                      ((string= href constants:*instance-psi*)
+                       (check-topic-id topic))
                       ((string= href t50a-psi)
                        (check-topic-id topic))
@@ -1155 +1160 @@
                        (check-topic-id topic)
                        (check-single-instanceOf document topic t3-psi :xtm-format '1.0)
-                       (loop for occurrence across (xpath-child-elems-by-qname topic *xtm1.0-ns* "occurrence")
+                       (loop for occurrence across (xpath-child-elems-by-qname
+                                                    topic *xtm1.0-ns* "occurrence")
                           do (let ((resourceRef
                                     (let ((resourceRef-nodes
-                                           (xpath-child-elems-by-qname occurrence *xtm1.0-ns* "resourceRef")))
+                                           (xpath-child-elems-by-qname
+                                            occurrence *xtm1.0-ns* "resourceRef")))
                                       (is (= (length resourceRef-nodes) 1))
-                                      (dom:get-attribute-ns (elt resourceRef-nodes 0) *xtm1.0-xlink* "href")))
+                                      (dom:get-attribute-ns (elt resourceRef-nodes 0)
+                                                            *xtm1.0-xlink* "href")))
                                    (instanceOf
                                     (let ((instanceOf-nodes
-                                           (xpath-child-elems-by-qname occurrence *xtm1.0-ns* "instanceOf")))
+                                           (xpath-child-elems-by-qname
+                                            occurrence *xtm1.0-ns* "instanceOf")))
                                       (is (= (length instanceOf-nodes) 1))
                                       (let ((topicRef-nodes
                                              (xpath-child-elems-by-qname
-                                              (elt instanceOf-nodes 0) *xtm1.0-ns* "topicRef")))
+                                              (elt instanceOf-nodes 0) *xtm1.0-ns*
+                                              "topicRef")))
                                         (is (= (length topicRef-nodes) 1))
                                         (get-subjectIndicatorRef-by-ref
@@ -1174 +1184 @@
                                           (elt topicRef-nodes 0) *xtm1.0-xlink* "href"))))))
                                (cond
-                                 ((string= resourceRef (first new-t100-occurrence-resourceRef-merge-2))
+                                 ((string= resourceRef
+                                           (first new-t100-occurrence-resourceRef-merge-2))
                                   (is (string= instanceOf t55-psi)))
-                                 ((string= resourceRef (second new-t100-occurrence-resourceRef-merge-2))
+                                 ((string= resourceRef
+                                           (second new-t100-occurrence-resourceRef-merge-2))
                                   (is (string= instanceOf t55-psi)))
                                  (t