X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Frun.lisp;h=8acdd5e0c253192b36501db978b8fb1aa377d542;hb=b6071df1af85018467bdc0c612a811c8b181e554;hp=6a10b332c197f85dfe51cbd4da29638931c3dd8b;hpb=4460cad7919fde8e2bf119d24807a05f1a1bf493;p=fiveam.git diff --git a/src/run.lisp b/src/run.lisp index 6a10b33..8acdd5e 100644 --- a/src/run.lisp +++ b/src/run.lisp @@ -1,4 +1,4 @@ -;; -*- lisp -*- +;;;; -*- Mode: Lisp; indent-tabs-mode: nil -*- (in-package :it.bese.fiveam) @@ -56,7 +56,7 @@ between test-cases has been detected.")) (defgeneric run-resolving-dependencies (test) (:documentation "Given a dependency spec determine if the spec is satisfied or not, this will generally involve running other -tests. If the dependency spec can be satisfied the test is alos +tests. If the dependency spec can be satisfied the test is also run.")) (defmethod run-resolving-dependencies ((test test-case)) @@ -117,10 +117,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 @@ -202,9 +204,7 @@ run.")) (run-tests) (run-tests))) (setf suite-results result-list - (status suite) (every (lambda (res) - (typep res 'test-passed)) - suite-results))) + (status suite) (every #'test-passed-p suite-results))) (with-run-state (result-list) (setf result-list (nconc result-list suite-results))))))) @@ -221,7 +221,7 @@ run.")) ;;;; ** Public entry points (defun run! (&optional (test-spec *suite*)) - "Equivalent to (explain (run TEST-SPEC))." + "Equivalent to (explain! (run TEST-SPEC))." (explain! (run test-spec))) (defun explain! (result-list) @@ -242,8 +242,8 @@ TEST-SPEC can be either a symbol naming a test or test suite, or a testable-object object. This function changes the operations performed by the !, !! and !!! functions." (psetf *!* (lambda () - (loop for test being the hash-keys of *test* - do (setf (status (get-test test)) :unknown)) + (loop :for test :being :the :hash-keys :of *test* + :do (setf (status (get-test test)) :unknown)) (bind-run-state ((result-list '())) (with-simple-restart (explain "Ignore the rest of the tests and explain current results") (%run test-spec))