r11469: update test suite

diff --git a/tests/basic.lisp b/tests/basic.lisp
index c74e05ca9ac8dce27d0e8c6b54c410d994233e7e..721b098b41e72a839f691ce011f4d5331e6b0411 100644 (file)
--- a/tests/basic.lisp
+++ b/tests/basic.lisp
@@ -20,56 +20,56 @@
 
 (setq *rt-basic*
   '(
-    (deftest :qrystr/1 (umlisp::query-string mrcon (cui lui))
-      "SELECT CUI,LUI FROM MRCON")
-    
-    (deftest :qrystr/1e (umlisp::query-string-eval 'mrcon '(cui lui))
-      "SELECT CUI,LUI FROM MRCON")
-    
-    (deftest :qrystr/2 (umlisp::query-string mrcon (cui lui) 0)
-      "SELECT CUI,LUI FROM MRCON AND KCUILRL<=0")
-    
-    (deftest :qrystr/2e (umlisp::query-string-eval 'mrcon '(cui lui) 0)
-      "SELECT CUI,LUI FROM MRCON AND KCUILRL<=0")
-    
-    (deftest :qrystr/3 (umlisp::query-string mrcon (cui lui) nil cui 5)
-      "SELECT CUI,LUI FROM MRCON WHERE CUI='5'")
-    
-    (deftest :qrystr/3e (umlisp::query-string-eval 'mrcon '(cui lui) nil 'cui 5)
-      "SELECT CUI,LUI FROM MRCON WHERE CUI='5'")
-    
-    (deftest :qrystr/4 (umlisp::query-string mrcon (cui lui) nil kpfstr "Abc")
-      "SELECT CUI,LUI FROM MRCON WHERE KPFSTR='Abc'")
-    
-    (deftest :qrystr/4e (umlisp::query-string-eval 'mrcon '(cui lui) nil 'kpfstr "Abc")
-      "SELECT CUI,LUI FROM MRCON WHERE KPFSTR='Abc'")
-    
-    (deftest :qrystr/5 (umlisp::query-string mrcon (cui lui) 2 cui 5 :single t)
-      "SELECT CUI,LUI FROM MRCON WHERE CUI='5' AND KCUILRL<=2 LIMIT 1")
-    
-    (deftest :qrystr/5e (umlisp::query-string-eval 'mrcon '(cui lui) 2 'cui 5 :single t)
-      "SELECT CUI,LUI FROM MRCON WHERE CUI='5' AND KCUILRL<=2 LIMIT 1")
-    
+    (deftest :qrystr/1 (umlisp::query-string mrconso (cui lui) nil nil nil)
+      "SELECT CUI,LUI FROM MRCONSO")
+
+    (deftest :qrystr/1e (umlisp::query-string-eval 'mrconso '(cui lui) nil nil nil)
+      "SELECT CUI,LUI FROM MRCONSO")
+
+    (deftest :qrystr/2 (umlisp::query-string mrconso (cui lui) 0 nil nil)
+      "SELECT CUI,LUI FROM MRCONSO AND KCUILRL<=0")
+
+    (deftest :qrystr/2e (umlisp::query-string-eval 'mrconso '(cui lui) 0 nil nil)
+      "SELECT CUI,LUI FROM MRCONSO AND KCUILRL<=0")
+
+    (deftest :qrystr/3 (umlisp::query-string mrconso (cui lui) nil cui 5)
+      "SELECT CUI,LUI FROM MRCONSO WHERE CUI='5'")
+
+    (deftest :qrystr/3e (umlisp::query-string-eval 'mrconso '(cui lui) nil 'cui 5)
+      "SELECT CUI,LUI FROM MRCONSO WHERE CUI='5'")
+
+    (deftest :qrystr/4 (umlisp::query-string mrconso (cui lui) nil kpfstr "Abc")
+      "SELECT CUI,LUI FROM MRCONSO WHERE KPFSTR='Abc'")
+
+    (deftest :qrystr/4e (umlisp::query-string-eval 'mrconso '(cui lui) nil 'kpfstr "Abc")
+      "SELECT CUI,LUI FROM MRCONSO WHERE KPFSTR='Abc'")
+
+    (deftest :qrystr/5 (umlisp::query-string mrconso (cui lui) 2 cui 5 :single t)
+      "SELECT CUI,LUI FROM MRCONSO WHERE CUI='5' AND KCUILRL<=2 LIMIT 1")
+
+    (deftest :qrystr/5e (umlisp::query-string-eval 'mrconso '(cui lui) 2 'cui 5 :single t)
+      "SELECT CUI,LUI FROM MRCONSO WHERE CUI='5' AND KCUILRL<=2 LIMIT 1")
+
     (deftest :qrystr/6 (umlisp::query-string mrdef (sab def) 2 cui 39 :lrl ksrl :single t)
       "SELECT SAB,DEF FROM MRDEF WHERE CUI='39' AND KSRL<=2 LIMIT 1")
-    
+
     (deftest :qrystr/6e (umlisp::query-string-eval 'mrdef '(sab def) 2 'cui 39 :lrl 'ksrl :single t)
       "SELECT SAB,DEF FROM MRDEF WHERE CUI='39' AND KSRL<=2 LIMIT 1")
-    
+
     (deftest :qrystr/7 (umlisp::query-string mrdef (sab def) 2 cui 39 :lrl ksrl :order (cui asc))
       "SELECT SAB,DEF FROM MRDEF WHERE CUI='39' AND KSRL<=2 ORDER BY CUI asc")
-    
+
     (deftest :qrystr/7e (umlisp::query-string-eval 'mrdef '(sab def) 2 'cui 39 :lrl 'ksrl :order '(cui asc))
       "SELECT SAB,DEF FROM MRDEF WHERE CUI='39' AND KSRL<=2 ORDER BY CUI asc")
-    
+
     (deftest :qrystr/8 (umlisp::query-string mrdef (sab def) 2 cui 39 :lrl ksrl
                        :order (cui asc def desc))
       "SELECT SAB,DEF FROM MRDEF WHERE CUI='39' AND KSRL<=2 ORDER BY CUI asc,DEF desc")
-    
+
     (deftest :qrystr/8e (umlisp::query-string-eval 'mrdef '(sab def) 2 'cui 39 :lrl 'ksrl
-                        :order '(cui asc def desc))  
+                        :order '(cui asc def desc))
       "SELECT SAB,DEF FROM MRDEF WHERE CUI='39' AND KSRL<=2 ORDER BY CUI asc,DEF desc")
-    
+
     (deftest :ui/1 (umlisp::parse-cui "C0002341") 2341)
     (deftest :ui/2 (umlisp::parse-lui "L0002341") 2341)
     (deftest :ui/3 (umlisp::parse-sui "S0000000") 0)
@@ -85,5 +85,5 @@
     (deftest :ui/13 (umlisp::parse-eui "E00002311") 2311)
     (deftest :ui/14 (umlisp::parse-lui "1234") 1234)
     (deftest :ui/15 (umlisp::parse-lui 1234) 1234)
-    
+
     ))

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