X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Fparse.lisp;h=3a4ebc84dbe46eaa8bbb8f4177ede1557bffe0e8;hb=01888d11a058ecc8c1dcde23291f9cfbb3a307c0;hp=c7a42e021b3c05c7c2341beebe73eea35d3afbc6;hpb=188873f068b0c53febe4ee0ededbc755fce4869d;p=umlisp.git

diff --git a/tests/parse.lisp b/tests/parse.lisp
index c7a42e0..3a4ebc8 100644
--- a/tests/parse.lisp
+++ b/tests/parse.lisp
@@ -24,25 +24,26 @@
 (setq *rt-parse*
   '(
     (deftest :parse/1
-	(umlisp::decompose-fil "abc")
+        (umlisp::decompose-fil "abc")
       "abc" nil)
-    
+
     (deftest :parse/2
-	(umlisp::decompose-fil "dir/abc")
+        (umlisp::decompose-fil "dir/abc")
       "abc" "dir")
-    
+
     (deftest :parse/3
-	(umlisp::decompose-fil nil)
+        (umlisp::decompose-fil nil)
       nil nil)
-    
+
     (deftest :parse/4
-	(umlisp::filename-to-tablename "test")
+        (umlisp::filename-to-tablename "test")
       "test")
-    
+
     (deftest :parse/5
-	(umlisp::filename-to-tablename "TEST.AB.RRF")
+        (umlisp::filename-to-tablename "TEST.AB.RRF")
       "TEST_AB")))
 
+;; specific for UMLS2007AA
 (when (probe-file (umlisp::umls-pathname "MRFILES.RRF"))
   (umlisp::ensure-ucols+ufiles)
   (setq
@@ -50,28 +51,29 @@
    (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*) 452)
       (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"))
+          (sort (mapcar #'u::col (umlisp::ucols (umlisp::find-ufile "MRCONSO.RRF")))
+           #'string<)
+        ("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"))
-		 #'string<))
-	t)
+          (equal
+           (sort (mapcar #'u::col (umlisp::ucols (umlisp::find-ufile "MRCONSO.RRF")))
+                 #'string<)
+           (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"))
+          (sort
+           (umlisp::custom-colnames-for-filename "MRCONSO.RRF")
+           #'string<)
+        ("KCUILRL" "KCUILUI" "KCUISUI" "KLUILRL" "KPFENG" "KSUILRL"))
       (deftest uparse.6
-	  (compiled-function-p
-	   (umlisp::custom-value-fun
-	    (umlisp::find-ucol "KCUISUI" "MRCONSO.RRF")))
-	t)
+          (compiled-function-p
+           (umlisp::custom-value-fun
+            (umlisp::find-ucol "KCUISUI" "MRCONSO.RRF")))
+        t)
       ))))