X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=tests%2Ftest-init.lisp;h=8312784216c8fd84f50f4575f255bab0de691363;hp=3efa6d62d193130c0431a0142afb8ab1796a7123;hb=f2e97f7b39c1cf82b6f3d1cec9362e551761549e;hpb=1011d4f44384e10f45ea0268e5c7fc759f417d3e diff --git a/tests/test-init.lisp b/tests/test-init.lisp index 3efa6d6..8312784 100644 --- a/tests/test-init.lisp +++ b/tests/test-init.lisp @@ -26,6 +26,7 @@ (defvar *rt-oodml*) (defvar *rt-syntax*) (defvar *rt-time*) +(defvar *rt-pool*) ;; Below must be set as nil since test-i18n.lisp is not loaded on all platforms. (defvar *rt-i18n* nil) @@ -40,29 +41,47 @@ (defvar *test-report-width* 80 "Width of test report in ems.") -(defun test-connect-to-database (db-type spec) +(defun find-test-connection-spec (db-type &key position) + (nth (or position 0) + (db-type-spec db-type (read-specs)))) + +(defun test-connect + (&key + (db-type *test-database-type* db-type-p) + position pool spec) + (unless spec + (setf spec + (or (and (null db-type-p) *test-connection-spec*) + (find-test-connection-spec db-type :position position)))) + (when *default-database* + (disconnect :database *default-database*)) + (setf *test-database-type* db-type + *test-database-user* + (cond + ((member db-type '(:oracle :odbc :aodbc)) (second spec)) + ((>= (length spec) 3) (third spec))) + *test-connection-spec* spec + *default-database* + (clsql:connect + spec + :database-type db-type + :make-default t + :if-exists :old + :pool pool) + *test-database-underlying-type* + (clsql-sys:database-underlying-type *default-database*)) + *default-database*) + +(defun test-setup-database (db-type &key (spec (find-test-connection-spec db-type))) (when (clsql-sys: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) - (setf *test-database-user* - (cond - ((member db-type '(:oracle :odbc :aodbc)) (second spec)) - ((>= (length spec) 3) (third spec)))) - ;; Connect to the database - (clsql:connect spec - :database-type db-type - :make-default t - :if-exists :old) - + (test-connect :db-type db-type :spec spec) ;; Ensure database is empty (truncate-database :database *default-database*) - (setf *test-database-underlying-type* - (clsql-sys:database-underlying-type *default-database*)) - ;; If Postgres, turn off notices to console (when (eql db-type :postgresql) (clsql:execute-command "SET client_min_messages = WARNING")) @@ -71,9 +90,13 @@ (defun default-suites () "The default list of tests to run." - (append *rt-internal* *rt-connection* *rt-basic* *rt-fddl* *rt-fdml* + (append *rt-connection* *rt-basic* *rt-fddl* *rt-fdml* *rt-ooddl* *rt-oodml* *rt-syntax* *rt-time* *rt-i18n*)) +(defun internal-suites () + "The default internal suites that should run without any specific backend" + (append *rt-internal* *rt-pool*)) + (defvar *error-count* 0) (defvar *error-list* nil) @@ -97,9 +120,10 @@ (defun run-tests (&key (report-stream *standard-output*) (sexp-report-stream nil) - (suites (default-suites))) + (suites (append (internal-suites) (default-suites)))) ;; clear SQL-OUTPUT cache (setq clsql-sys::*output-hash* (make-hash-table :test #'equal)) + (setf *test-database-underlying-type* nil) (let ((specs (read-specs)) (*report-stream* report-stream) (*sexp-report-stream* sexp-report-stream) @@ -109,12 +133,17 @@ (warn "Not running tests because test configuration file is missing") (return-from run-tests :skipped)) (load-necessary-systems specs) - (dolist (db-type +all-db-types+) - (dolist (spec (db-type-spec db-type specs)) - (let ((*test-connection-spec* spec) - (*test-connection-db-type* db-type)) - (do-tests-for-backend db-type spec :suites suites))))) - (zerop *error-count*)) + ;;run the internal suites + (do-tests-for-internals :suites (intersection suites (internal-suites))) + ;; run backend-specific tests + (let ((suites (intersection suites (default-suites)))) + (when suites + (dolist (db-type +all-db-types+) + (dolist (spec (db-type-spec db-type specs)) + (format report-stream "~%~%Start Running Tests Against: ~A ~A~%~%" db-type (ignore-errors (subseq spec 0 2))) + (do-tests-for-backend db-type spec :suites suites) + (format report-stream "~%~%Finished Running Tests Against: ~A ~A~%~%" db-type (ignore-errors (subseq spec 0 2))))))) + (zerop *error-count*))) (defun load-necessary-systems (specs) (dolist (db-type +all-db-types+) @@ -147,9 +176,37 @@ "") )) +(defun do-tests-for-internals (&key (suites (internal-suites))) + (write-report-banner "Test Suite" "CLSQL Internals" *report-stream* + "N/A") + (%do-tests suites nil)) + +(defun %do-tests (test-forms db-type) + (regression-test:rem-all-tests) + (dolist (test-form test-forms) + (eval test-form)) + + (let* ((cl:*print-right-margin* *test-report-width*) + (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* :readably t)) + (push sexp-error *error-list*)) + ) + (defun do-tests-for-backend (db-type spec &key (suites (default-suites)) ) - (test-connect-to-database db-type spec) + (test-setup-database db-type :spec spec) (unwind-protect (multiple-value-bind (test-forms skip-tests) (compute-tests-for-backend db-type *test-database-underlying-type* :suites suites) @@ -157,28 +214,11 @@ (write-report-banner "Test Suite" db-type *report-stream* (database-name-from-spec spec db-type)) - (regression-test:rem-all-tests) - (dolist (test-form test-forms) - (eval test-form)) - - (let* ((cl:*print-right-margin* *test-report-width*) - (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* :readably t)) - (push sexp-error *error-list*)) - - (format *report-stream* "~&Tests skipped:") + (%do-tests test-forms db-type) + + (format *report-stream* "~&~D of ~D Tests skipped:" + (length skip-tests) + (length test-forms)) (if skip-tests (let ((max-test-name (length (symbol-name (caar skip-tests))))) (dolist (skipped (cdr skip-tests)) @@ -190,7 +230,7 @@ ;; word-wrap the reason string field (let* ((test (car skipped)) (reason (cdr skipped)) - (rlen (length reason)) + ;; (rlen (length reason)) (rwidth (max 20 (- (or *test-report-width* 80) max-test-name 3))) (rwords (clsql-sys::delimited-string-to-list reason #\space t)) (rformat (format nil "~~{~~<~%~~1,~D:;~~A~~> ~~}" rwidth)) @@ -215,7 +255,9 @@ (let ((test (second test-form))) (cond ((and (not (eql db-underlying-type :mysql)) - (clsql-sys:in test :connection/query-command)) + (clsql-sys:in test :connection/query-command + :basic/reallybigintegers/1 + :connection/pool/procedure-mysql)) (push (cons test "known to work only in MySQL as yet.") skip-tests)) ((and (null (clsql-sys:db-type-has-views? db-underlying-type)) (clsql-sys:in test :fddl/view/1 :fddl/view/2 :fddl/view/3 :fddl/view/4)) @@ -287,7 +329,7 @@ (clsql-sys:in test :fdml/select/9)) (push (cons test "mssql uses integer math for AVG.") skip-tests)) ((and (not (member *test-database-underlying-type* - '(:postgresql :mysql :sqlite3))) + '(:postgresql :mysql :sqlite3 ))) (clsql-sys:in test :fdml/select/37 :fdml/select/38)) (push (cons test "LIMIT keyword not supported in SELECT.") skip-tests)) ((and (not (clsql-sys:db-type-has-auto-increment? db-underlying-type)) @@ -300,7 +342,7 @@ :oodml/update-records/6 :oodml/update-records/7 :oodml/update-records/8 :oodml/update-records/9 :oodml/update-records/9-slots :oodml/update-records/10 - :oodml/update-records/11 :oodml/update-instance/3 + :oodml/update-records/11 :OODML/UPDATE-RECORDS/12 :oodml/update-instance/3 :oodml/update-instance/4 :oodml/update-instance/5 :oodml/update-instance/6 :oodml/update-instance/7 :oodml/db-auto-sync/3 :oodml/db-auto-sync/4)) @@ -311,6 +353,22 @@ :time/pg/fdml/usec :time/pg/oodml/no-usec :time/pg/oodml/usec)) (push (cons test "Postgres specific test.") skip-tests)) + ((and (eql *test-database-type* :postgresql-socket3) + (clsql-sys:in test :BASIC/SELECT/2 :basic/select/3)) + (push (cons test "Postgres-socket3 always auto types") + skip-tests)) + ((and (eql *test-database-type* :postgresql-socket3) + (clsql-sys:in test :fdml/select/18)) + (push (cons test "Postgres-socket3 doesnt support attribute based type coersion") + skip-tests)) + ((and (eql *test-database-type* :postgresql-socket3) + (clsql-sys:in test :basic/map/1 :basic/map/2 :basic/map/3 :basic/map/4 + :basic/do/1 :basic/do/2 :fdml/do-query/1 :fdml/map-query/1 + :fdml/map-query/2 :fdml/map-query/3 :fdml/map-query/4 :fdml/loop/1 + :fdml/loop/2 :fdml/loop/3 + )) + (push (cons test "postgresql-socket3 doesnt support cursoring interface") + skip-tests)) ((and (member *test-database-underlying-type* '(:mysql)) (clsql-sys:in test :time/cross-platform/msec :time/cross-platform/usec/no-tz :time/cross-platform/usec/tz)) @@ -326,10 +384,9 @@ (defun rapid-load (type &optional (position 0)) "Rapid load for interactive testing." - (when *default-database* - (disconnect :database *default-database*)) - (test-connect-to-database type (nth position (db-type-spec type (read-specs)))) - ;(test-initialise-database) + (test-setup-database + type + :spec (find-test-connection-spec type :position position)) *default-database*) (defun rl ()