r9186: add attribute caching, improve inititialize-database-type

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

diff --git a/tests/test-init.lisp b/tests/test-init.lisp
index da6063337677cdb49bb2cbce91b7bdacb0a721c5..3e6d85a21a551b44d7f30f52399bf1f23ac6673f 100644 (file)
--- a/tests/test-init.lisp
+++ b/tests/test-init.lisp
@@ -137,8 +137,8 @@
                 :make-default t
                 :if-exists :old)
   
-  (unless (db-backend-has-create/destroy-db? db-type)
-    (truncate-database :database *default-database*))
+  ;; Ensure database is empty
+  (truncate-database :database *default-database*)
   
   (setf *test-database-underlying-type*
        (clsql-sys:database-underlying-type *default-database*))
@@ -334,7 +334,7 @@
 (defun load-necessary-systems (specs)
   (dolist (db-type +all-db-types+)
     (when (db-type-spec db-type specs)
-      (db-type-ensure-system db-type))))
+      (clsql:initialize-database-type :database-type db-type))))
 
 (defun do-tests-for-backend (db-type spec)
   (test-connect-to-database db-type spec)
@@ -371,15 +371,15 @@
        (dolist (test-form test-forms)
          (eval test-form))
        
-       (let ((remaining (rtest:do-tests *report-stream*)))
-         (when (rt:pending-tests)
+       (let ((remaining (regression-test:do-tests *report-stream*)))
+         (when (regression-test:pending-tests)
            (incf *error-count* (length remaining))))
        
        (let ((sexp-error (list db-type 
                                *test-database-underlying-type* 
                                (get-universal-time)
                                (length test-forms)
-                               (rt:pending-tests)
+                               (regression-test:pending-tests)
                                (lisp-implementation-type) 
                                (lisp-implementation-version)
                                (machine-type))))