X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-init.lisp;h=585df962cdb3a0dc443e03d9402b04082c40e629;hb=86440ca219f801a087ad917d1c1f46c77c920aa4;hp=0f4180ab4d3d301a459e8f2bc57ac78851f5e017;hpb=cd64aa8907160d3a2c2d0e531c831f1db44c7a61;p=clsql.git

diff --git a/tests/test-init.lisp b/tests/test-init.lisp
index 0f4180a..585df96 100644
--- a/tests/test-init.lisp
+++ b/tests/test-init.lisp
@@ -7,18 +7,26 @@
 ;;;;
 ;;;; Initialisation utilities for running regression tests on CLSQL. 
 ;;;;
+;;;; This file is part of CLSQL.
+;;;;
+;;;; CLSQL users are granted the rights to distribute and use this software
+;;;; as governed by the terms of the Lisp Lesser GNU Public License
+;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; ======================================================================
 
 (in-package #:clsql-tests)
 
+(defvar *report-stream*)
 (defvar *rt-connection*)
 (defvar *rt-fddl*)
 (defvar *rt-fdml*)
 (defvar *rt-ooddl*)
 (defvar *rt-oodml*)
 (defvar *rt-syntax*)
+(defvar *rt-time*)
 
 (defvar *test-database-type* nil)
+(defvar *test-database-underlying-type* nil)
 (defvar *test-database-user* nil)
 
 (defclass thing ()
@@ -113,22 +121,25 @@
 
 
 
-(defun test-connect-to-database (database-type spec)
-  (setf *test-database-type* database-type)
+(defun test-connect-to-database (db-type spec)
+  (when (db-backend-has-create/destroy-db? db-type)
+    (ignore-errors (destroy-database spec :database-type db-type))
+    (ignore-errors (create-database spec :database-type db-type)))
+  
+  (setf *test-database-type* db-type)
   (when (>= (length spec) 3)
     (setq *test-database-user* (third spec)))
-
+  
   ;; Connect to the database
   (clsql:connect spec
-		 :database-type database-type
+		 :database-type db-type
 		 :make-default t
-		 :if-exists :old))
-
-(defmacro with-ignore-errors (&rest forms)
-  `(progn
-     ,@(mapcar
-	(lambda (x) (list 'ignore-errors x))
-	forms)))
+		 :if-exists :old)
+  
+  (setf *test-database-underlying-type*
+	(clsql-sys:database-underlying-type *default-database*))
+  
+  *default-database*)
 
 (defparameter company1 nil)
 (defparameter employee1 nil)
@@ -143,10 +154,12 @@
 (defparameter employee10 nil)
 
 (defun test-initialise-database ()
-  ;; Create the tables for our view classes
-  (ignore-errors
-   (clsql:drop-view-from-class 'employee)
-   (clsql:drop-view-from-class 'company))
+  ;; Ensure that old objects are removed
+  (unless (db-backend-has-create/destroy-db? *test-database-type*)
+    (truncate-database *default-database*)) 
+  
+  (test-basic-initialize)
+  
   (clsql:create-view-from-class 'employee)
   (clsql:create-view-from-class 'company)
 
@@ -246,7 +259,10 @@
 		     :first-name "Vladamir"
 		     :last-name "Putin"
 		     :email "putin@soviet.org"))
-  
+
+  ;; sleep to ensure birthdays are no longer at current time
+  (sleep 2) 
+
   ;; Lenin manages everyone
   (clsql:add-to-relation employee2 'manager employee1)
   (clsql:add-to-relation employee3 'manager employee1)
@@ -285,7 +301,13 @@
 
 (defvar *error-count* 0)
 
-(defun run-tests ()
+(defun run-tests-append-report-file (report-file)
+  (with-open-file (out report-file :direction :output
+		       :if-exists :append
+		       :if-does-not-exist :create)
+    (run-tests out)))
+    
+(defun run-tests (&optional (*report-stream* *standard-output*))
   (let ((specs (read-specs))
 	(*error-count* 0))
     (unless specs
@@ -293,41 +315,90 @@
       (return-from run-tests :skipped))
     (load-necessary-systems specs)
     (dolist (db-type +all-db-types+)
-      (let ((spec (db-type-spec db-type specs)))
-	(when spec
-	  (do-tests-for-backend spec db-type))))
-    (zerop *error-count*)))
+      (dolist (spec (db-type-spec db-type specs))
+	(do-tests-for-backend db-type spec))))
+  (zerop *error-count*))
 
 (defun load-necessary-systems (specs)
   (dolist (db-type +all-db-types+)
     (when (db-type-spec db-type specs)
       (db-type-ensure-system db-type))))
 
-(defun do-tests-for-backend (spec db-type)
-  (format t 
+(defun do-tests-for-backend (db-type spec)
+  (test-connect-to-database db-type spec)
+
+  (unwind-protect
+      (multiple-value-bind (test-forms skip-tests)
+	  (compute-tests-for-backend db-type *test-database-underlying-type*)
+	
+  (format *report-stream* 
 	  "~&
-*******************************************************************
-***     Running CLSQL tests with ~A backend.
-*******************************************************************
-" db-type)
-  (regression-test:rem-all-tests)
+******************************************************************************
+***     CLSQL Test Suite begun at ~A
+***     ~A
+***     ~A
+***     Database ~A backend~A.
+******************************************************************************
+" 
+(clsql-base:format-time nil (clsql-base:utime->time (get-universal-time)))
+(lisp-implementation-type)
+(lisp-implementation-version)
+db-type
+(if (not (eq db-type *test-database-underlying-type*))
+    (format nil " with underlying type ~A" *test-database-underlying-type*)
+    "")
+)
   
-  ;; Tests of clsql-base
-  (ignore-errors (destroy-database spec :database-type db-type))
-  (ignore-errors (create-database spec :database-type db-type))
-  (with-tests (:name "CLSQL")
-    (test-basic spec db-type))
-  (incf *error-count* *test-errors*)
+	(test-initialise-database)
 
-  (ignore-errors (destroy-database spec :database-type db-type))
-  (ignore-errors (create-database spec :database-type db-type))
-  (dolist (test (append *rt-connection* *rt-fddl* *rt-fdml*
+	(regression-test:rem-all-tests)
+	(dolist (test-form test-forms)
+	  (eval test-form))
+	
+	(let ((remaining (rtest:do-tests *report-stream*)))
+	  (when (consp remaining)
+	    (incf *error-count* (length remaining))))
+	
+	(format *report-stream* "~&Tests skipped:")
+	(if skip-tests
+	    (dolist (skipped skip-tests)
+	      (format *report-stream*
+		      "~&   ~20A ~A~%" (car skipped) (cdr skipped)))
+	  (format *report-stream* " None~%")))
+    (disconnect)))
+
+
+(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*))
-    (eval test))
-  (test-connect-to-database db-type spec)
-  (test-initialise-database)
-  (let ((remaining (rtest:do-tests)))
-    (when (consp remaining)
-      (incf *error-count* (length remaining))))
-  (disconnect))
+      (let ((test (second test-form)))
+	(cond
+	  ((and (null (db-type-has-views? db-underlying-type))
+		(clsql-base-sys::in test :fddl/view/1 :fddl/view/2 :fddl/view/3 :fddl/view/4))
+	   (push (cons test "views not supported") skip-tests))
+	  ((and (null (db-type-has-boolean-where? db-underlying-type))
+		(clsql-base-sys::in test :fdml/select/11 :oodml/select/5))
+	   (push (cons test "boolean where not supported") skip-tests))
+	  ((and (null (db-type-has-subqueries? db-underlying-type))
+		(clsql-base-sys::in test :fdml/select/5 :fdml/select/10))
+	   (push (cons test "subqueries not supported") skip-tests))
+	  ((and (null (db-type-transaction-capable? db-underlying-type
+						    *default-database*))
+		(clsql-base-sys::in test :fdml/transaction/1 :fdml/transaction/2 :fdml/transaction/3 :fdml/transaction/4))
+	   (push (cons test "transactions not supported") skip-tests))
+	  ((and (null (db-type-has-fancy-math? db-underlying-type))
+		(clsql-base-sys::in test :fdml/select/1))
+	   (push (cons test "fancy math not supported") skip-tests))
+	  ((and (eql *test-database-type* :sqlite)
+		(clsql-base-sys::in test :fddl/view/4 :fdml/select/10))
+	   (push (cons test "not supported by sqlite") skip-tests))
+	  (t
+	   (push test-form test-forms)))))
+    (values (nreverse test-forms) (nreverse skip-tests))))