X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-oodml.lisp;h=7e875b26d8f182adcee256ca699364e15b79aa48;hb=550cc94ed84c6cfc61830c25fac2b39e92393b06;hp=9969abde55dc504ac479eedd358a7eda907a9730;hpb=4fbe211143d23f4f0ece6db9433d7cabf5ef49ce;p=clsql.git

diff --git a/tests/test-oodml.lisp b/tests/test-oodml.lisp
index 9969abd..7e875b2 100644
--- a/tests/test-oodml.lisp
+++ b/tests/test-oodml.lisp
@@ -59,14 +59,6 @@
   3)
 
 (deftest :oodml/select/6
-    (slot-value (caar (clsql:select 'employee :where [= 1 [emplid]])) 'married)
-  t)
-
-(deftest :oodml/select/7
-    (slot-value (caar (clsql:select 'employee :where [= 4 [emplid]])) 'married)
-  nil)
-
-(deftest :oodml/select/8
     (let ((a (caar (clsql:select 'address :where [= 1 [emplid]]))))
       (values
        (slot-value a 'street-number)
@@ -75,7 +67,7 @@
        (slot-value a 'postal-code)))
   10 "Park Place" "Leningrad" 123)
 
-(deftest :oodml/select/9
+(deftest :oodml/select/7
     (let ((a (caar (clsql:select 'address :where [= 2 [emplid]]))))
       (values
        (slot-value a 'street-number)
@@ -84,10 +76,10 @@
        (slot-value a 'postal-code)))
   nil "" "no city" 0)
 
-(deftest :oodml/select/10 
+(deftest :oodml/select/8 
     (mapcar #'(lambda (e) (slot-value e 'married)) 
               (clsql:select 'employee :flatp t :order-by [emplid]))
-  (T T T NIL NIL NIL NIL NIL NIL NIL))
+  (t t t nil nil nil nil nil nil nil))
 
 ;; tests update-records-from-instance 
 (deftest :oodml/update-records/1
@@ -295,11 +287,11 @@
                                            "Lenin"]])
  (("Lenin" "Widgets Inc.")))
 
-;(deftest :oodml/iteration/3
-;    (loop for (e) being the tuples in 
-;          [select 'employee :where [married] :order-by [emplid]]
-;          collect (slot-value e 'last-name))
-;  ("Lenin" "Stalin" "Trotsky"))
+(deftest :oodml/iteration/3
+    (loop for (e) being the records in 
+          (select 'employee :where [married] :order-by [emplid])
+     collect (slot-value e 'last-name))
+  ("Lenin" "Stalin" "Trotsky"))
 
 ))