;; -*- lisp -*-
-(in-package :it.bese.FiveAM)
+(in-package :it.bese.fiveam)
;;;; * Test Suites
;;;; ** Creating Suits
-(defmacro def-suite (name &key description in default-test-args)
+(defmacro def-suite (name &key description in)
"Define a new test-suite named NAME.
IN (a symbol), if provided, causes this suite te be nested in the
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."
+named NAME."
`(eval-when (:compile-toplevel :load-toplevel :execute)
(make-suite ',name
,@(when description `(:description ,description))
- ,@(when in `(:in ',in))
- ,@(when default-test-args `(:default-test-args ,default-test-args)))
+ ,@(when in `(:in ',in)))
',name))
-(defun make-suite (name &key description in default-test-args)
+(defmacro def-suite* (name &rest def-suite-args)
+ `(progn
+ (def-suite ,name ,@def-suite-args)
+ (in-suite ,name)))
+
+(defun make-suite (name &key description in)
"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)))
+ (let ((suite (make-instance 'test-suite :name name)))
(when description
(setf (description suite) description))
(loop for i in (ensure-list in)
- for in-suite = (get-test i)
- do (progn
- (when (null in-suite)
- (cerror "Create a new suite named ~A." "Unknown suite ~A." i)
- (setf (get-test in-suite) (make-suite i)
- in-suite (get-test in-suite)))
- (setf (gethash name (tests in-suite)) suite)))
+ for in-suite = (get-test i)
+ do (progn
+ (when (null in-suite)
+ (cerror "Create a new suite named ~A." "Unknown suite ~A." i)
+ (setf (get-test in-suite) (make-suite i)
+ in-suite (get-test in-suite)))
+ (setf (gethash name (tests in-suite)) suite)))
(setf (get-test name) suite)
suite))
;;;; ** Managing the Current Suite
(defvar *suite* (setf (get-test 'NIL)
- (make-suite 'NIL :description "Global Suite"))
+ (make-suite 'NIL :description "Global Suite"))
"The current test suite object")
(defmacro in-suite (suite-name)
`(%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)
- (setf *suite* ,suite)
- (progn
- (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))))
+ (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))
+ (setf (get-test ',suite-name) (make-suite ',suite-name :in ',in)
+ *suite* (get-test ',suite-name))))
',suite-name)))
;; Copyright (c) 2002-2003, Edward Marco Baringer
-;; All rights reserved.
-;;
+;; All rights reserved.
+;;
;; Redistribution and use in source and binary forms, with or without
;; modification, are permitted provided that the following conditions are
;; met:
-;;
+;;
;; - Redistributions of source code must retain the above copyright
;; notice, this list of conditions and the following disclaimer.
-;;
+;;
;; - Redistributions in binary form must reproduce the above copyright
;; notice, this list of conditions and the following disclaimer in the
;; documentation and/or other materials provided with the distribution.
;; - Neither the name of Edward Marco Baringer, nor BESE, nor the names
;; of its contributors may be used to endorse or promote products
;; derived from this software without specific prior written permission.
-;;
+;;
;; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
;; "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
;; LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR