X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-ooddl.lisp;h=d7a193385edd1944539cc4e00182e24de9e5f6b0;hb=ef14ad12b16560c41609086cfba2ed15fef64061;hp=d2b73f48278208f4feafab93c0697ebb9ae5ae1d;hpb=7c7edf1d85706148f55a8507a261d024defa0c7c;p=clsql.git

diff --git a/tests/test-ooddl.lisp b/tests/test-ooddl.lisp
index d2b73f4..d7a1933 100644
--- a/tests/test-ooddl.lisp
+++ b/tests/test-ooddl.lisp
@@ -22,10 +22,10 @@
 
 (setq *rt-ooddl*
       '(
-	
+
 ;; Ensure slots inherited from standard-classes are :virtual
 (deftest :ooddl/metaclass/1
-    (values 
+    (values
      (clsql-sys::view-class-slot-db-kind
       (clsql-sys::slotdef-for-slot-with-class 'extraterrestrial
                                              (find-class 'person)))
@@ -42,10 +42,35 @@
      (every #'(lambda (slotd)
                 (typep slotd 'clsql-sys::view-class-effective-slot-definition))
             (clsql-sys::class-slots (find-class 'employee)))
+     (every #'(lambda (slotd)
+                (typep slotd 'clsql-sys::view-class-effective-slot-definition))
+            (clsql-sys::class-slots (find-class 'setting)))
+     (every #'(lambda (slotd)
+                (typep slotd 'clsql-sys::view-class-effective-slot-definition))
+            (clsql-sys::class-slots (find-class 'theme)))
+     (every #'(lambda (slotd)
+                (typep slotd 'clsql-sys::view-class-effective-slot-definition))
+            (clsql-sys::class-slots (find-class 'node)))
      (every #'(lambda (slotd)
                 (typep slotd 'clsql-sys::view-class-effective-slot-definition))
             (clsql-sys::class-slots (find-class 'company))))
-  t t t)
+  t t t t t t)
+
+;; Ensure classes are correctly marked normalised or not, default not
+;(deftest :ooddl/metaclass/3
+;    (values
+;     (clsql-sys::normalisedp derivednode1)
+;    (clsql-sys::normalisedp basenode)
+;    (clsql-sys::normalisedp company1)
+;    (clsql-sys::normalisedp employee3)
+;    (clsql-sys::normalisedp derivednode-sc-2))
+;  t nil nil nil t)
+
+;(deftest :ooddl/metaclass/3
+; (values
+;  (normalisedp (find-class 'baseclass))
+;  (normalisedp (find-class 'normderivedclass)))
+; nil t)
 
 (deftest :ooddl/join/1
     (mapcar #'(lambda (e) (slot-value e 'ecompanyid))
@@ -66,8 +91,8 @@
         (clsql:execute-command "set datestyle to 'iso'"))
       (clsql:update-records [employee] :av-pairs `((birthday ,now))
                            :where [= [emplid] 1])
-      (let ((dbobj (car (clsql:select 'employee :where [= [birthday] now] 
-				      :flatp t))))
+      (let ((dbobj (car (clsql:select 'employee :where [= [birthday] now]
+                                      :flatp t))))
         (values
          (slot-value dbobj 'last-name)
          (clsql:time= (slot-value dbobj 'birthday) now))))
@@ -82,7 +107,7 @@
         (clsql:update-records [employee] :av-pairs `((birthday ,now))
                              :where [= [emplid] 1])
         (let ((dbobj (car (clsql:select 'employee :where [= [birthday] now]
-					:flatp t))))
+                                        :flatp t))))
           (unless (clsql:time= (slot-value dbobj 'birthday) now)
             (setf fail-index x))
           (setf now (clsql:roll now :day (* 10 x)))))
@@ -92,13 +117,13 @@
 (deftest :ooddl/time/3
     (progn
       (when (member *test-database-underlying-type* '(:postgresql :postgresql-socket))
-	(clsql:execute-command "set datestyle to 'iso'"))
+        (clsql:execute-command "set datestyle to 'iso'"))
       (let ((dbobj (car (clsql:select 'employee :where [= [emplid] 10]
-				      :flatp t))))
-	(list
-	 (eql *test-start-utime* (slot-value dbobj 'bd-utime))
-	 (clsql:time= (slot-value dbobj 'birthday)
-		      (clsql:utime->time (slot-value dbobj 'bd-utime))))))
+                                      :flatp t))))
+        (list
+         (eql *test-start-utime* (slot-value dbobj 'bd-utime))
+         (clsql:time= (slot-value dbobj 'birthday)
+                      (clsql:utime->time (slot-value dbobj 'bd-utime))))))
   (t t))
 
 ))