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

diff --git a/tests/parse.lisp b/tests/parse.lisp
index 14126be..c7a42e0 100644
--- a/tests/parse.lisp
+++ b/tests/parse.lisp
@@ -19,39 +19,59 @@
 (in-package #:umlisp-tests)
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (if (probe-file (umlisp::umls-pathname "MRFILES"))
-    (pushnew :umls-files cl:*features*)
-    (format t "~&Skipping tests based on UMLS distribution~%")))
+  (import '(umlisp::*umls-files* umlisp::*umls-cols*)))
 
-(import '(umlisp::*umls-files* umlisp::*umls-cols*))
+(setq *rt-parse*
+  '(
+    (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")))
 
-#+umls-files
-(progn
+(when (probe-file (umlisp::umls-pathname "MRFILES.RRF"))
   (umlisp::ensure-ucols+ufiles)
-  (deftest uparse.1 (length *umls-files*) 52)
-  (deftest uparse.2 (length *umls-cols*) 327)
-  (deftest uparse.3
-      (sort (mapcar #'u::col (umlisp::ucols (umlisp::find-ufile "MRCON")))
-	    #'string<)
-    ("CUI" "KCUILRL" "KCUILUI" "KCUISUI" "KLUILRL" "KPFSTR" "LAT" "LRL" "LUI" "STR"
-               "STT" "SUI" "TS"))
-  (deftest uparse.4
-      (sort (umlisp::fields (umlisp::find-ufile "MRCON"))
-	    #'string<)
-    ("CUI" "KCUILRL" "KCUILUI" "KCUISUI" "KLUILRL" "KPFSTR" "LAT" "LRL" "LUI" "STR"
-	   "STT" "SUI" "TS"))
-  (deftest uparse.5
-      (sort
-       (umlisp::custom-colnames-for-filename "MRCON")
-       #'string<)
-    ("KCUILRL" "KCUILUI" "KCUISUI" "KLUILRL" "KPFSTR"))
-  (deftest uparse.6
-      (compiled-function-p
-       (umlisp::custom-value-fun
-	(umlisp::find-ucol "KCUISUI" "MRCON")))
-    t)
-  ) ;; umls-files
-
-#+umls-files
-(setq cl:*features* (delete :umls-files cl:*features*))
-
+  (setq
+   *rt-parse*
+   (append
+    *rt-parse*
+    '(
+      (deftest uparse.1 (length *umls-files*) 64)
+      (deftest uparse.2 (length *umls-cols*) 327)
+      (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"))
+      (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)
+      (deftest uparse.5
+	  (sort
+	   (umlisp::custom-colnames-for-filename "MRCONSO.RRF")
+	   #'string<)
+	("KCUILRL" "KCUILUI" "KCUISUI" "KLUILRL" "KPFSTR"))
+      (deftest uparse.6
+	  (compiled-function-p
+	   (umlisp::custom-value-fun
+	    (umlisp::find-ucol "KCUISUI" "MRCONSO.RRF")))
+	t)
+      ))))