X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests.lisp;h=0caf623e078e9e22259c95d8a21c5c18da6a7504;hb=58e6e7e38d835e51beb5f21440b4b7bd27d106f2;hp=79fd4e324ac82d9dc5669824ad866654deab484c;hpb=48a89995e768d67fcda55849a70b0ea759ad190a;p=umlisp.git

diff --git a/tests.lisp b/tests.lisp
index 79fd4e3..0caf623 100644
--- a/tests.lisp
+++ b/tests.lisp
@@ -7,7 +7,7 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  May 2003
 ;;;;
-;;;; $Id: tests.lisp,v 1.3 2003/05/03 17:10:08 kevin Exp $
+;;;; $Id: tests.lisp,v 1.4 2003/05/05 23:13:28 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -24,30 +24,55 @@
 
 (rem-all-tests)
 
-(deftest qs.1 (umlisp::query-string 'mrcon '(cui lui))
+(deftest qs.1 (umlisp::query-string mrcon (cui lui))
   "select CUI,LUI from MRCON")
 
-(deftest qs.2 (umlisp::query-string 'mrcon '(cui lui) 0)
-  "select CUI,LUI from MRCON and KCUILRL <= 0")
+(deftest qs.1e (umlisp::query-string-eval 'mrcon '(cui lui))
+  "select CUI,LUI from MRCON")
+
+(deftest qs.2 (umlisp::query-string mrcon (cui lui) 0)
+  "select CUI,LUI from MRCON and KCUILRL<=0")
+
+(deftest qs.2e (umlisp::query-string-eval 'mrcon '(cui lui) 0)
+  "select CUI,LUI from MRCON and KCUILRL<=0")
 
-(deftest qs.3 (umlisp::query-string 'mrcon '(cui lui) nil 'cui 5)
+(deftest qs.3 (umlisp::query-string mrcon (cui lui) nil cui 5)
   "select CUI,LUI from MRCON where CUI=5")
 
-(deftest qs.4 (umlisp::query-string 'mrcon '(cui lui) nil 'kpfstr "Abc")
+(deftest qs.3e (umlisp::query-string-eval 'mrcon '(cui lui) nil 'cui 5)
+  "select CUI,LUI from MRCON where CUI=5")
+
+(deftest qs.4 (umlisp::query-string mrcon (cui lui) nil kpfstr "Abc")
   "select CUI,LUI from MRCON where KPFSTR='Abc'")
 
-(deftest qs.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 qs.4e (umlisp::query-string-eval 'mrcon '(cui lui) nil 'kpfstr "Abc")
+  "select CUI,LUI from MRCON where KPFSTR='Abc'")
+
+(deftest qs.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 qs.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 qs.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 qs.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 qs.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 qs.6 (umlisp::query-string 'mrdef '(sab def) 2 'cui 39 :lrlname 'ksrl :single t)
-  "select SAB,DEF from MRDEF where CUI=39 and KSRL <= 2 limit 1")
+(deftest qs.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 qs.7 (umlisp::query-string 'mrdef '(sab def) 2 'cui 39 :lrlname 'ksrl :order '((cui . asc)))
-  "select SAB,DEF from MRDEF where CUI=39 and KSRL <= 2 order by CUI asc")
+(deftest qs.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 qs.8 (umlisp::query-string 'mrdef '(sab def) 2 'cui 39 :lrlname 'ksrl
-				    :order '((cui . asc) (def . desc)))
-  "select SAB,DEF from MRDEF where CUI=39 and KSRL <= 2 order by CUI asc,DEF desc")
+(deftest qs.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")