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

diff --git a/tests/parse.lisp b/tests/parse.lisp
index c7a42e0..83753b4 100644
--- a/tests/parse.lisp
+++ b/tests/parse.lisp
@@ -26,23 +26,24 @@
     (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")))
 
+;; specific for UMLS2007AA
 (when (probe-file (umlisp::umls-pathname "MRFILES.RRF"))
   (umlisp::ensure-ucols+ufiles)
   (setq
@@ -50,25 +51,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*) 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"))
+	("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