X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Fbasic.lisp;fp=tests%2Fbasic.lisp;h=65b219fd52eecf8737df80a11d6c16cf98c01418;hb=357dad37300c0f2cc45156dae18bd89265c20431;hp=2cfae733d6e034180642e795afedaafb1550d55e;hpb=9b58980b6ae6abeb9aba762e76a879c339aa68b7;p=umlisp.git

diff --git a/tests/basic.lisp b/tests/basic.lisp
index 2cfae73..65b219f 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.
 ;;;; *************************************************************************
 
@@ -21,54 +21,54 @@
 (setq *rt-basic*
   '(
     (deftest :qrystr/1 (umlisp::query-string mrcon (cui lui))
-      "select CUI,LUI from MRCON")
+      "SELECT CUI,LUI FROM MRCON")
     
     (deftest :qrystr/1e (umlisp::query-string-eval 'mrcon '(cui lui))
-      "select CUI,LUI from MRCON")
+      "SELECT CUI,LUI FROM MRCON")
     
     (deftest :qrystr/2 (umlisp::query-string mrcon (cui lui) 0)
-      "select CUI,LUI from MRCON and KCUILRL<=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")
+      "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'")
+      "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'")
+      "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'")
+      "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'")
+      "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")
+      "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")
+      "SELECT CUI,LUI FROM MRCON 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")
+      "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")
+      "SELECT SAB,DEF FROM MRDEF WHERE CUI='39' AND SRL<=2 ORDER BY CUI asc,DEF desc")
     
     (deftest :ui/1 (umlisp::parse-cui "C0002341") 2341)
     (deftest :ui/2 (umlisp::parse-lui "L0002341") 2341)