X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-oodml.lisp;h=1d8c6948ba807a91bb68bb7658465e9211e3d90b;hb=3a3ccc7a171dc4c6c10bc7e3fea8461fca6dc51b;hp=f934e5e7db407db244e5015e70ee38d84894dc42;hpb=e34a3ace07250c5c55b3f6598459ef7b6d292bdb;p=clsql.git

diff --git a/tests/test-oodml.lisp b/tests/test-oodml.lisp
index f934e5e..1d8c694 100644
--- a/tests/test-oodml.lisp
+++ b/tests/test-oodml.lisp
@@ -110,8 +110,8 @@
                          (clsql:select 'employee :order-by '(([emplid] :asc)) 
                                        :flatp t))
           (mapcar #'(lambda (x) (slot-value x 'emplid))
-                  (clsql:select 'employee :order-by '(([emplid] :desc)) 
-                                :flatp t)))
+	   (clsql:select 'employee :order-by '(([emplid] :desc)) 
+			 :flatp t)))
          (1 2 3 4 5 6 7 8 9 10)
          (10 9 8 7 6 5 4 3 2 1))
 
@@ -154,7 +154,7 @@
 
 	(deftest :oodm/retrieval/8	    
 	    (mapcar #'(lambda (ea) (slot-value (slot-value ea 'address) 'street-number))
-	     (select 'employee-address :flatp t :order-by [aaddressid] :caching nil))
+	     (select 'employee-address :flatp t :order-by [ea_join aaddressid] :caching nil))
 	  (10 10 nil nil nil))
 
 	(deftest :oodm/retrieval/9
@@ -384,7 +384,7 @@
 	  ("Lenin" "Stalin" "Trotsky"))
 
 
-      (deftest oodml/cache/1
+      (deftest :oodml/cache/1
 	  (progn
 	    (setf (clsql-sys:record-caches *default-database*) nil)
 	    (let ((employees (select 'employee)))
@@ -392,17 +392,17 @@
 		     employees (select 'employee))))
 	t)
 
-	(deftest oodml/cache/2
+	(deftest :oodml/cache/2
 	    (let ((employees (select 'employee)))
 	      (equal employees (select 'employee :flatp t)))
 	  nil)
 	
-	(deftest oodml/refresh/1
+	(deftest :oodml/refresh/1
 	    (let ((addresses (select 'address)))
 	      (equal addresses (select 'address :refresh t)))
 	  t)
 
-	(deftest oodml/refresh/2
+	(deftest :oodml/refresh/2
 	    (let* ((addresses (select 'address :order-by [addressid] :flatp t))
 		   (city (slot-value (car addresses) 'city)))
 	      (clsql:update-records [addr] 
@@ -419,14 +419,14 @@
 			new-city)))
 	  t "Leningrad" "A new city")
 	
-	(deftest oodml/refresh/3
+	(deftest :oodml/refresh/3
 	    (let* ((addresses (select 'address :order-by [addressid] :flatp t)))
 	      (values
 	       (equal addresses (select 'address :refresh t :flatp t))
 	       (equal addresses (select 'address :flatp t))))
 	  nil nil)
 	
-	(deftest oodml/refresh/4
+	(deftest :oodml/refresh/4
 	    (let* ((addresses (select 'address :order-by [addressid] :flatp t))
 		   (*db-auto-sync* t))
 	      (make-instance 'address :addressid 1000 :city "A new address city")
@@ -440,7 +440,7 @@
 	  2 3 t t)
 		
 	      
-	(deftest oodml/uoj/1
+	(deftest :oodml/uoj/1
 	    (progn
 	      (let* ((dea-list (select 'deferred-employee-address :caching nil :order-by [ea_join aaddressid]
 				       :flatp t))