X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fsuite.lisp;h=4e96bfb2bb949431f0fc92ca81de888949fc9d9e;hb=refs%2Fheads%2Fsmall-fixes;hp=505a66f2c4f3837cfb93d68d86d6fa0276ae43fb;hpb=1b24abf09e9fbb2a23c25a9583e5547514482f1b;p=fiveam.git

diff --git a/src/suite.lisp b/src/suite.lisp
index 505a66f..4e96bfb 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
 
@@ -34,14 +34,14 @@ named NAME."
      (def-suite ,name ,@def-suite-args)
      (in-suite ,name)))
 
-(defun make-suite (name &key description in)
+(defun make-suite (name &key description ((:in parent-suite)))
   "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))
-    (loop for i in (ensure-list in)
+    (loop for i in (ensure-list parent-suite)
           for in-suite = (get-test i)
           do (progn
                (when (null in-suite)
@@ -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)))