r11469: update test suite

[umlisp.git] / tests / parse.lisp

diff --git a/tests/parse.lisp b/tests/parse.lisp
index c7a42e021b3c05c7c2341beebe73eea35d3afbc6..9e1670a4802ad2d9c77a1485f3905d199e9e1f6a 100644 (file)
--- a/tests/parse.lisp
+++ b/tests/parse.lisp
@@ -26,19 +26,19 @@
     (deftest :parse/1
        (umlisp::decompose-fil "abc")
       "abc" nil)
-    
+
     (deftest :parse/2
        (umlisp::decompose-fil "dir/abc")
       "abc" "dir")
-    
+
     (deftest :parse/3
        (umlisp::decompose-fil nil)
       nil nil)
-    
+
     (deftest :parse/4
        (umlisp::filename-to-tablename "test")
       "test")
-    
+
     (deftest :parse/5
        (umlisp::filename-to-tablename "TEST.AB.RRF")
       "TEST_AB")))
@@ -50,25 +50,26 @@
    (append
     *rt-parse*
     '(
-      (deftest uparse.1 (length *umls-files*) 64)
-      (deftest uparse.2 (length *umls-cols*) 327)
+      (deftest uparse.1 (length *umls-files*) 63)
+      (deftest uparse.2 (length *umls-cols*) 434)
       (deftest uparse.3
          (sort (mapcar #'u::col (umlisp::ucols (umlisp::find-ufile "MRCONSO.RRF")))
           #'string<)
-       ("AUI" "CODE" "CUI" "CVF" "ISPREF" "KCUILRL" "KCUILUI" "KCUISUI" "KLUILRL" "KPFSTR" "LAT" "LUI" "SAB" "SAUI" "SCUI" "SDUI" "SRL" "STR"
-        "STT" "SUI" "SUPPRESS" "TS" "TTY"))
+       ("AUI" "CODE" "CUI" "CVF" "ISPREF" "KCUILRL" "KCUILUI" "KCUISUI" "KLUILRL"
+         "KPFENG" "KSUILRL" "LAT" "LUI" "SAB" "SAUI" "SCUI" "SDUI" "SRL" "STR" "STT"
+         "SUI" "SUPPRESS" "TS" "TTY"))
       (deftest uparse.4
          (equal
           (sort (mapcar #'u::col (umlisp::ucols (umlisp::find-ufile "MRCONSO.RRF")))
                 #'string<)
-          (sort (umlisp::fields (umlisp::find-ufile "MRCONSO.RRF"))
+          (sort (copy-seq (umlisp::fields (umlisp::find-ufile "MRCONSO.RRF")))
                 #'string<))
        t)
       (deftest uparse.5
          (sort
           (umlisp::custom-colnames-for-filename "MRCONSO.RRF")
           #'string<)
-       ("KCUILRL" "KCUILUI" "KCUISUI" "KLUILRL" "KPFSTR"))
+       ("KCUILRL" "KCUILUI" "KCUISUI" "KLUILRL" "KPFENG" "KSUILRL"))
       (deftest uparse.6
          (compiled-function-p
           (umlisp::custom-value-fun