X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Frun.lisp;h=d9b8c5f5ac18183e900109458d7ff0350e381235;hb=35dc0e063d9f601afdc1202e4724628525e723f0;hp=31a3f02bf831087ec4b34e26fbb5aec11b4b02af;hpb=7d4e022893800af3a0b3818b7da807907e94a830;p=fiveam.git diff --git a/src/run.lisp b/src/run.lisp index 31a3f02..d9b8c5f 100644 --- a/src/run.lisp +++ b/src/run.lisp @@ -39,6 +39,9 @@ (defparameter *debug-on-failure* nil "T if we should drop into a debugger on a failing check, NIL otherwise.") +(defparameter *print-names* t + "T if we should print test running progress, NIL otherwise.") + (defun import-testing-symbols (package-designator) (import '(5am::is 5am::is-true 5am::is-false 5am::signals 5am::finishes) package-designator)) @@ -117,10 +120,12 @@ run.")) (defun results-status (result-list) "Given a list of test results (generated while running a test) return true if all of the results are of type TEST-PASSED, - faile otherwise." - (every (lambda (res) - (typep res 'test-passed)) - result-list)) + fail otherwise. + Returns a second value, which is the set of failed tests." + (let ((failed-tests + (remove-if #'test-passed-p result-list))) + (values (null failed-tests) + failed-tests))) (defun return-result-list (test-lambda) "Run the test function TEST-LAMBDA and return a list of all @@ -182,12 +187,16 @@ run.")) !!, !!!")) (defmethod %run ((test test-case)) + (when *print-names* + (format *test-dribble* "~% Running test ~A " (name test))) (run-resolving-dependencies test)) (defmethod %run ((tests list)) (mapc #'%run tests)) (defmethod %run ((suite test-suite)) + (when *print-names* + (format *test-dribble* "~%Running test suite ~A~%" (name suite))) (let ((suite-results '())) (flet ((run-tests () (loop @@ -218,7 +227,8 @@ run.")) ;;;; ** Public entry points -(defun run! (&optional (test-spec *suite*)) +(defun run! (&optional (test-spec *suite*) + &key ((:print-names *print-names*) *print-names*)) "Equivalent to (explain! (run TEST-SPEC))." (explain! (run test-spec))) @@ -233,7 +243,7 @@ detailed-text-explainer with output going to *test-dribble*" (*debug-on-failure* t)) (run! test-spec))) -(defun run (test-spec) +(defun run (test-spec &key ((:print-names *print-names*) *print-names*)) "Run the test specified by TEST-SPEC. TEST-SPEC can be either a symbol naming a test or test suite, or