Author: lgiessmann Date: Fri Dec 11 18:37:41 2009 New Revision: 171
Log: adapted some unit-tests to the fixed ticket #50 --> core_psis.xtm
Modified: trunk/src/unit_tests/exporter_xtm2.0_test.lisp trunk/src/unit_tests/importer_test.lisp trunk/src/unit_tests/json_test.lisp
Modified: trunk/src/unit_tests/exporter_xtm2.0_test.lisp ============================================================================== --- trunk/src/unit_tests/exporter_xtm2.0_test.lisp (original) +++ trunk/src/unit_tests/exporter_xtm2.0_test.lisp Fri Dec 11 18:37:41 2009 @@ -386,9 +386,9 @@ (defvar core-occurrence-psi "http://www.topicmaps.org/xtm/1.0/core.xtm#occurrence") (defvar core-class-instance-psi "http://www.topicmaps.org/xtm/1.0/core.xtm#class-instance") (defvar core-class-psi "http://www.topicmaps.org/xtm/1.0/core.xtm#class") -(defvar core-superclass-subclass-psi "http://www.topicmaps.org/xtm/1.0/core.xtm#superclass-subclass") -(defvar core-superclass-psi "http://www.topicmaps.org/xtm/1.0/core.xtm#superclass") -(defvar core-subclass-psi "http://www.topicmaps.org/xtm/1.0/core.xtm#subclass") +(defvar core-superclass-subclass-psi "http://www.topicmaps.org/xtm/1.0/core.xtm#supertype-subtype") +(defvar core-superclass-psi "http://www.topicmaps.org/xtm/1.0/core.xtm#supertype") +(defvar core-subclass-psi "http://www.topicmaps.org/xtm/1.0/core.xtm#subtype") (defvar core-sort-psi "http://www.topicmaps.org/xtm/1.0/core.xtm#sort") (defvar core-display-psi "http://www.topicmaps.org/xtm/1.0/core.xtm#display") (defvar core-type-instance-psi "http://psi.topicmaps.org/iso13250/model/type-instance")
Modified: trunk/src/unit_tests/importer_test.lisp ============================================================================== --- trunk/src/unit_tests/importer_test.lisp (original) +++ trunk/src/unit_tests/importer_test.lisp Fri Dec 11 18:37:41 2009 @@ -197,7 +197,7 @@ (top-t301 (get-item-by-id "t301")) (top-t301a (get-item-by-id "t301a")) ;one of the core PSIs - (top-sup-sub (get-item-by-id "superclass-subclass" :xtm-id "core.xtm"))) + (top-sup-sub (get-item-by-id "supertype-subtype" :xtm-id "core.xtm"))) (is (= (internal-id top-t301) (internal-id top-t301a))) (is (= (length (occurrences top-t1)) 0)) @@ -210,7 +210,7 @@ (is-true (item-identifiers (first (names top-t301)))) ;after merge (is (= 2 (length (psis top-t301)))) ;after merge (is (= 3 (length (occurrences top-t301)))) ;after merge - (is (string= "http://www.topicmaps.org/xtm/1.0/core.xtm#superclass-subclass" + (is (string= "http://www.topicmaps.org/xtm/1.0/core.xtm#supertype-subtype" (uri (first (psis top-sup-sub)))))))
;34 topics in 35 topic elements in notificationbase.xtm and 13
Modified: trunk/src/unit_tests/json_test.lisp ============================================================================== --- trunk/src/unit_tests/json_test.lisp (original) +++ trunk/src/unit_tests/json_test.lisp Fri Dec 11 18:37:41 2009 @@ -1171,11 +1171,11 @@ (is (= (length topic-psis) 1))) ((string= (first topic-psis) "http://www.topicmaps.org/xtm/1.0/core.xtm#class") (is (= (length topic-psis) 1))) - ((string= (first topic-psis) "http://www.topicmaps.org/xtm/1.0/core.xtm#superclass-subclass") + ((string= (first topic-psis) "http://www.topicmaps.org/xtm/1.0/core.xtm#supertype-subtype") (is (= (length topic-psis) 1))) - ((string= (first topic-psis) "http://www.topicmaps.org/xtm/1.0/core.xtm#superclass") + ((string= (first topic-psis) "http://www.topicmaps.org/xtm/1.0/core.xtm#supertype") (is (= (length topic-psis) 1))) - ((string= (first topic-psis) "http://www.topicmaps.org/xtm/1.0/core.xtm#subclass") + ((string= (first topic-psis) "http://www.topicmaps.org/xtm/1.0/core.xtm#subtype") (is (= (length topic-psis) 1))) ((string= (first topic-psis) "http://www.topicmaps.org/xtm/1.0/core.xtm#sort") (is (= (length topic-psis) 1))) @@ -1254,10 +1254,10 @@ ((string= (first topic-psis) "http://psi.egovpt.org/service/Norwegian+National+Curriculum") (is (= (length topic-psis) 1))) ((or (string= (first topic-psis) "http://psi.egovpt.org/service/Google+Maps") - (string= (first topic-psis) "http://maps.google.com") - (is (= (length topic-psis) 2)) - (is (or (string= (second topic-psis) "http://psi.egovpt.org/service/Google+Maps") - (string= (second topic-psis) "http://maps.google.com"))))) + (string= (first topic-psis) "http://maps.google.com")) + (is (= (length topic-psis) 2)) + (is (or (string= (second topic-psis) "http://psi.egovpt.org/service/Google+Maps") + (string= (second topic-psis) "http://maps.google.com")))) (t (is-true (format t "found bad topic-psis: ~a" topic-psis)))))))))