X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=tests%2Ftest-init.lisp;h=c13f545a0452eec526df868c51b2bdcd4b131ba2;hp=585df962cdb3a0dc443e03d9402b04082c40e629;hb=9bbed78051e80e6ab76ae47834136035602bbbf1;hpb=86440ca219f801a087ad917d1c1f46c77c920aa4 diff --git a/tests/test-init.lisp b/tests/test-init.lisp index 585df96..c13f545 100644 --- a/tests/test-init.lisp +++ b/tests/test-init.lisp @@ -16,7 +16,8 @@ (in-package #:clsql-tests) -(defvar *report-stream*) +(defvar *report-stream* nil "Stream to send text report.") +(defvar *sexp-report-stream* nil "Stream to send sexp report.") (defvar *rt-connection*) (defvar *rt-fddl*) (defvar *rt-fdml*) @@ -33,24 +34,22 @@ ((extraterrestrial :initform nil :initarg :extraterrestrial))) (def-view-class person (thing) - ((height :db-kind :base :accessor height :type float :nulls-ok t + ((height :db-kind :base :accessor height :type float :initarg :height) - (married :db-kind :base :accessor married :type boolean :nulls-ok t + (married :db-kind :base :accessor married :type boolean :initarg :married) - (birthday :nulls-ok t :type clsql-base:wall-time :initarg :birthday) + (birthday :type clsql-base:wall-time :initarg :birthday) (hobby :db-kind :virtual :initarg :hobby :initform nil))) (def-view-class employee (person) ((emplid :db-kind :key :db-constraints :not-null - :nulls-ok nil :type integer :initarg :emplid) (groupid :db-kind :key :db-constraints :not-null - :nulls-ok nil :type integer :initarg :groupid) (first-name @@ -64,7 +63,6 @@ (email :accessor employee-email :type (string 100) - :nulls-ok t :initarg :email) (companyid :type integer) @@ -76,8 +74,7 @@ :foreign-key companyid :set nil)) (managerid - :type integer - :nulls-ok t) + :type integer) (manager :accessor employee-manager :db-kind :join @@ -89,12 +86,12 @@ (def-view-class company () ((companyid - :db-type :key + :db-kind :key :db-constraints :not-null :type integer :initarg :companyid) (groupid - :db-type :key + :db-kind :key :db-constraints :not-null :type integer :initarg :groupid) @@ -136,6 +133,9 @@ :make-default t :if-exists :old) + ;; Ensure database is empty + (truncate-database :database *default-database*) + (setf *test-database-underlying-type* (clsql-sys:database-underlying-type *default-database*)) @@ -154,10 +154,6 @@ (defparameter employee10 nil) (defun test-initialise-database () - ;; 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) @@ -300,16 +296,28 @@ (clsql:update-records-from-instance company1)) (defvar *error-count* 0) +(defvar *error-list* nil) (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))) + (let* ((report-path (etypecase report-file + (pathname report-file) + (string (parse-namestring report-file)))) + (sexp-report-path (make-pathname :defaults report-path + :type "sexp"))) + (with-open-file (rs report-path :direction :output + :if-exists :append + :if-does-not-exist :create) + (with-open-file (srs sexp-report-path :direction :output + :if-exists :append + :if-does-not-exist :create) + (run-tests :report-stream rs :sexp-report-stream srs))))) -(defun run-tests (&optional (*report-stream* *standard-output*)) +(defun run-tests (&key (report-stream *standard-output*) (sexp-report-stream nil)) (let ((specs (read-specs)) - (*error-count* 0)) + (*report-stream* report-stream) + (*sexp-report-stream* sexp-report-stream) + (*error-count* 0) + (*error-list* nil)) (unless specs (warn "Not running tests because test configuration file is missing") (return-from run-tests :skipped)) @@ -322,7 +330,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) @@ -331,34 +339,50 @@ (multiple-value-bind (test-forms skip-tests) (compute-tests-for-backend db-type *test-database-underlying-type*) - (format *report-stream* - "~& + (format *report-stream* + "~& ****************************************************************************** *** CLSQL Test Suite begun at ~A *** ~A -*** ~A +*** ~A on ~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*) - "") -) - + (clsql-base:format-time + nil + (clsql-base:utime->time (get-universal-time))) + (lisp-implementation-type) + (lisp-implementation-version) + (machine-type) + db-type + (if (not (eq db-type *test-database-underlying-type*)) + (format nil " with underlying type ~A" + *test-database-underlying-type*) + "") + ) + (test-initialise-database) - + (regression-test:rem-all-tests) (dolist (test-form test-forms) (eval test-form)) - (let ((remaining (rtest:do-tests *report-stream*))) - (when (consp remaining) + (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) + (regression-test:pending-tests) + (lisp-implementation-type) + (lisp-implementation-version) + (machine-type)))) + (when *sexp-report-stream* + (write sexp-error :stream *sexp-report-stream*)) + (push sexp-error *error-list*)) + (format *report-stream* "~&Tests skipped:") (if skip-tests (dolist (skipped skip-tests) @@ -371,32 +395,29 @@ db-type (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)) - (clsql-base-sys::in test :fddl/view/1 :fddl/view/2 :fddl/view/3 :fddl/view/4)) + (clsql-base::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)) + (clsql-base::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)) + (clsql-base::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)) + (clsql-base::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)) + (clsql-base::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)) + (clsql-base::in test :fddl/view/4 :fdml/select/10)) (push (cons test "not supported by sqlite") skip-tests)) (t (push test-form test-forms)))))