X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tests.lisp;h=594c7cca4659a8d665c7c9984342c22e5295e1a7;hb=9375ef50cfc7a1804bb1bf3766ee79874e8ae2b6;hp=b230068c023f96093ab1aab012bbd0b0b6b1da81;hpb=ad091133b3c6e27c105f6631076cb408df386d42;p=jscl.git
diff --git a/tests.lisp b/tests.lisp
index b230068..594c7cc 100644
--- a/tests.lisp
+++ b/tests.lisp
@@ -1,15 +1,41 @@
-(defvar *passed-tets* 0)
-(defvar *failed-tets* 0)
-(defvar *timestamp* (get-internal-real-time))
+(defparameter *total-tests* 0)
+(defparameter *passed-tests* 0)
+(defparameter *failed-tests* 0)
+(defparameter *expected-failures* 0)
+(defparameter *unexpected-passes* 0)
+
+(defvar *use-html-output-p* t)
+(defvar *timestamp* nil)
(defmacro test (condition)
- `(cond
- (,condition
- (write-line ,(concat "Test `" (prin1-to-string condition) "' passed"))
- (incf *passed-tets*))
- (t
- (write-line ,(concat "Test `" (prin1-to-string condition) "' failed."))
- (incf *failed-tets*))))
-
-(write-line "Running tests...")
-(write-line "")
+ `(progn
+ (cond
+ (,condition
+ (format t "Test `~S' passed~%" ',condition)
+ (incf *passed-tests*))
+ (t
+ (if *use-html-output-p*
+ (format t "Test `~S' failed.~%" ',condition)
+ (format t "Test `~S' failed.~%" ',condition))
+ (incf *failed-tests*)))
+ (incf *total-tests*)))
+
+(defmacro expected-failure (condition)
+ `(progn
+ (cond
+ (,condition
+ (if *use-html-output-p*
+ (format t "Test `~S' passed unexpectedly!~%" ',condition)
+ (format t "Test `~S' passed unexpectedly!~%" ',condition))
+ (incf *unexpected-passes*))
+ (t
+ (format t "Test `~S' failed expectedly.~%" ',condition)
+ (incf *expected-failures*)))
+ (incf *total-tests*)))
+
+(defmacro test-equal (form value)
+ `(test (equal ,form, value)))
+
+
+(format t "Running tests...~%~%")
+(setq *timestamp* (get-internal-real-time))