X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fsuite.lisp;h=972e1f659df9be82d2f318aba1cb3ef42e741911;hb=7d4e022893800af3a0b3818b7da807907e94a830;hp=505a66f2c4f3837cfb93d68d86d6fa0276ae43fb;hpb=1b24abf09e9fbb2a23c25a9583e5547514482f1b;p=fiveam.git diff --git a/src/suite.lisp b/src/suite.lisp index 505a66f..972e1f6 100644 --- a/src/suite.lisp +++ b/src/suite.lisp @@ -1,6 +1,6 @@ -;; -*- lisp -*- +;;;; -*- Mode: Lisp; indent-tabs-mode: nil -*- -(in-package :it.bese.FiveAM) +(in-package :it.bese.fiveam) ;;;; * Test Suites @@ -37,7 +37,7 @@ named NAME." (defun make-suite (name &key description in) "Create a new test suite object. -Overides any existing suite named NAME." +Overrides any existing suite named NAME." (let ((suite (make-instance 'test-suite :name name))) (when description (setf (description suite) description)) @@ -72,14 +72,14 @@ See also: DEF-SUITE *SUITE*" `(%in-suite ,suite-name :in ,in :fail-on-error nil)) (defmacro %in-suite (suite-name &key (fail-on-error t) in) - (with-unique-names (suite) + (with-gensyms (suite) `(progn - (if-bind ,suite (get-test ',suite-name) + (if-let (,suite (get-test ',suite-name)) (setf *suite* ,suite) (progn (when ,fail-on-error (cerror "Create a new suite named ~A." - "Unkown suite ~A." ',suite-name)) + "Unknown suite ~A." ',suite-name)) (setf (get-test ',suite-name) (make-suite ',suite-name :in ',in) *suite* (get-test ',suite-name)))) ',suite-name)))