X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fsuite.lisp;h=ee4b2f622207d98ce8c84779e9610f261de53713;hb=168a8cb290c6d9b3fa40e500fd044ecacebb5429;hp=64223e06d1b0419872e208ab89a2bea8d9de5e7b;hpb=1454981ac5f4f7ea8fe741a8125efbf0b09497ea;p=fiveam.git

diff --git a/src/suite.lisp b/src/suite.lisp
index 64223e0..ee4b2f6 100644
--- a/src/suite.lisp
+++ b/src/suite.lisp
@@ -6,7 +6,7 @@
 
 ;;;; Test suites allow us to collect multiple tests into a single
 ;;;; object and run them all using asingle name. Test suites do not
-;;;; affect teh way test are run northe way the results are handled,
+;;;; affect the way test are run nor the way the results are handled,
 ;;;; they are simply a test organizing group.
 
 ;;;; Test suites can contain both tests and other test suites. Running
@@ -16,20 +16,28 @@
 
 ;;;; ** Creating Suits
 
-(defmacro def-suite (name &key description in)
+(defmacro def-suite (name &key description in default-test-args)
   "Define a new test-suite named NAME.
 
 IN (a symbol), if provided, causes this suite te be nested in the
-suite named by IN."
-  `(progn
+suite named by IN. NB: This macro is built on top of make-suite,
+as such it, like make-suite, will overrwrite any existing suite
+named NAME.
+
+DEFAULT-TEST-ARGS, if provided, will ba passed to the TEST forms
+defined in this suite."
+  `(eval-when (:compile-toplevel :load-toplevel :execute)
      (make-suite ',name
-		 ,@(when description `(:description ,description))
-		 ,@(when in `(:in ',in)))
+                 ,@(when description `(:description ,description))
+                 ,@(when in `(:in ',in))
+                 ,@(when default-test-args `(:default-test-args ,default-test-args)))
      ',name))
 
-(defun make-suite (name &key description in)
-  "Create a new test suite object."
-  (let ((suite (make-instance 'test-suite :name name)))
+(defun make-suite (name &key description in default-test-args)
+  "Create a new test suite object.
+
+Overides any existing suite named NAME."
+  (let ((suite (make-instance 'test-suite :name name :default-test-args default-test-args)))
     (when description
       (setf (description suite) description))
     (loop for i in (ensure-list in)
@@ -55,14 +63,23 @@ after the execution of this form are, unless specified otherwise,
 in the test-suite named SUITE-NAME.
 
 See also: DEF-SUITE *SUITE*"
+  `(eval-when (:compile-toplevel :load-toplevel :execute)
+     (%in-suite ,suite-name)))
+
+(defmacro in-suite* (suite-name &key in)
+  "Just like in-suite, but silently creates missing suites."
+  `(%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)
     `(progn
        (if-bind ,suite (get-test ',suite-name)
            (setf *suite* ,suite)
 	   (progn
-	     (cerror "Create a new suite named ~A."
-		     "Unkown suite ~A." ',suite-name)
-	     (setf (get-test ',suite-name) (make-suite ',suite-name)
+	     (when ,fail-on-error
+               (cerror "Create a new suite named ~A."
+                       "Unkown suite ~A." ',suite-name))
+	     (setf (get-test ',suite-name) (make-suite ',suite-name :in ',in)
 		   *suite* (get-test ',suite-name))))
        ',suite-name)))