X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-init.lisp;h=6b8ddedc5c04eb6abd0799a46fc3a1e5fc708254;hb=7cdc9aa48baa3c52923d61da6fa632eb47ac0b5d;hp=da6063337677cdb49bb2cbce91b7bdacb0a721c5;hpb=967266c94b00f91e5967b8330fe2b9134b0c0447;p=clsql.git

diff --git a/tests/test-init.lisp b/tests/test-init.lisp
index da60633..6b8dded 100644
--- 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))))
@@ -399,12 +399,9 @@
 (defun compute-tests-for-backend (db-type db-underlying-type)
   (let ((test-forms '())
 	(skip-tests '()))
-    (dolist (test-form (append
-			(if (eq db-type :sqlite)
-			    (test-basic-forms-untyped)
-			  (test-basic-forms))
-			*rt-connection* *rt-fddl* *rt-fdml*
-			*rt-ooddl* *rt-oodml* *rt-syntax*))
+    (dolist (test-form (append (test-basic-forms)
+			       *rt-connection* *rt-fddl* *rt-fdml*
+			       *rt-ooddl* *rt-oodml* *rt-syntax*))
       (let ((test (second test-form)))
 	(cond
 	  ((and (null (db-type-has-views? db-underlying-type))