X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Fbasic.lisp;h=2142e6fc3ef2def1e2b2c819249b4712be2fd887;hb=28aeae6f894ac1e2b4ded59af9371b373e38a701;hp=2cfae733d6e034180642e795afedaafb1550d55e;hpb=188873f068b0c53febe4ee0ededbc755fce4869d;p=umlisp.git

diff --git a/tests/basic.lisp b/tests/basic.lisp
index 2cfae73..2142e6f 100644
--- a/tests/basic.lisp
+++ b/tests/basic.lisp
@@ -12,7 +12,7 @@
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
 ;;;;
-;;;; UMLisp users are granted the rights to distribute and use this software
+;;;; UMLisp users are granted the rights to distribute AND use this software
 ;;;; as governed by the terms of the GNU General Public License.
 ;;;; *************************************************************************
 
@@ -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")
-    
+      "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")
-    
+      "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")
-    
+      "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")
-    
+      "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")
-    
+                        :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))  
-      "select SAB,DEF from MRDEF where CUI='39' and KSRL<=2 order by 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)
-    
+
     ))