r9235: fix test

[clsql.git] / tests / test-oodml.lisp

diff --git a/tests/test-oodml.lisp b/tests/test-oodml.lisp
index 84046fcdd20167045e0c5d411cbde4ec8356f8ac..39d7eea3f5e40fdb9d80c8eed5801805146e087b 100644 (file)
--- 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,6 +76,11 @@
        (slot-value a 'postal-code)))
   nil "" "no city" 0)
 
+(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))
+
 ;; tests update-records-from-instance 
 (deftest :oodml/update-records/1
     (values
@@ -290,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 [< [emplid] 4] :order-by [emplid]]
+       collect (slot-value e 'last-name))
+  ("Lenin" "Stalin" "Trotsky"))
 
 ))