ds-artists: new test dataset ds-artists. clsql-tests.asd: add new filee ds-artists...

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

diff --git a/tests/test-init.lisp b/tests/test-init.lisp
index 00661e52e010a3c31d40fed41e4119e98455fbdb..3efa6d62d193130c0431a0142afb8ab1796a7123 100644 (file)
--- a/tests/test-init.lisp
+++ b/tests/test-init.lisp
@@ -26,6 +26,8 @@
 (defvar *rt-oodml*)
 (defvar *rt-syntax*)
 (defvar *rt-time*)
+;; Below must be set as nil since test-i18n.lisp is not loaded on all platforms.
+(defvar *rt-i18n* nil)
 
 (defvar *test-database-type* nil)
 (defvar *test-database-underlying-type* nil)
@@ -35,7 +37,7 @@
 (defvar *test-start-utime* nil)
 (defvar *test-connection-spec* nil)
 (defvar *test-connection-db-type* nil)
-
+(defvar *test-report-width* 80 "Width of test report in ems.")
 
 
 (defun test-connect-to-database (db-type spec)
@@ -61,12 +63,16 @@
   (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"))
+
   *default-database*)
 
 (defun default-suites ()
   "The default list of tests to run."
   (append *rt-internal* *rt-connection* *rt-basic* *rt-fddl* *rt-fdml*
-         *rt-ooddl* *rt-oodml* *rt-syntax* *rt-time*))
+         *rt-ooddl* *rt-oodml* *rt-syntax* *rt-time* *rt-i18n*))
 
 
 (defvar *error-count* 0)
@@ -155,7 +161,8 @@
            (dolist (test-form test-forms)
              (eval test-form))
 
-           (let ((remaining (regression-test:do-tests *report-stream*)))
+           (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))))
 
@@ -180,7 +187,22 @@
                        (setq max-test-name len))))
                  (let ((fmt (format nil "~~&  ~~~DA ~~A~~%" max-test-name)))
                    (dolist (skipped skip-tests)
-                     (format *report-stream* fmt (car skipped) (cdr skipped)))))
+                     ;; word-wrap the reason string field
+                     (let* ((test (car skipped))
+                            (reason (cdr skipped))
+                            (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))
+                            (rwrapped (format nil rformat rwords))
+                            (rlines (clsql-sys::delimited-string-to-list rwrapped #\Newline t)))
+                       (dolist (rline rlines)
+                         (format *report-stream* fmt (if test
+                                                         (prog1
+                                                             test
+                                                           (setq test nil))
+                                                         "")
+                                 rline))))))
                (format *report-stream* " None~%")))
     (disconnect)))
 
@@ -194,7 +216,7 @@
         (cond
          ((and (not (eql db-underlying-type :mysql))
                (clsql-sys:in test :connection/query-command))
-          (push (cons test "Known to only work in mysql as yet.") skip-tests))
+          (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))
            (push (cons test "views not supported.") skip-tests))
@@ -227,7 +249,7 @@
            (push (cons test "bigint not supported.") skip-tests))
           ((and (eql *test-database-underlying-type* :mysql)
                 (clsql-sys:in test :fdml/select/26))
-           (push (cons test "string table aliases not supported on all mysql versions.") skip-tests))
+           (push (cons test "string table aliases not supported on all MySQL versions.") skip-tests))
           ((and (eql *test-database-underlying-type* :mysql)
                 (clsql-sys:in test :fdml/select/22 :fdml/query/5
                                 :fdml/query/7 :fdml/query/8))
@@ -272,12 +294,13 @@
                (clsql-sys:in test :oodml/select/12 :oodml/select/13 :oodml/select/14
                              :oodml/select/15 :oodml/select/16 :oodml/select/17
                              :oodml/select/18 :oodml/select/19 :oodml/select/20
-                             :oodml/select/21 :oodml/select/22
+                             :oodml/select/21 :oodml/select/22 :oodml/select/23
                              :oodml/update-records/4 :oodml/update-records/4-slots
                              :oodml/update-records/5 :oodml/update-records/5-slots
                              :oodml/update-records/6 :oodml/update-records/7
                              :oodml/update-records/8 :oodml/update-records/9
-                             :oodml/update-records/9-slots :oodml/update-instance/3
+                             :oodml/update-records/9-slots :oodml/update-records/10
+                             :oodml/update-records/11 :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))