`make-package' signals error if package exists

[jscl.git] / tests.lisp

diff --git a/tests.lisp b/tests.lisp
index 7707756..a09ee75 100644 (file)
--- a/tests.lisp
+++ b/tests.lisp
@@ -1,15 +1,45 @@
-(defvar *passed-tests* 0)
-(defvar *failed-tests* 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)
+
+(defun test-fn (condition form)
+  (cond
+    (condition
+     (format t "Test `~S' passed~%" form)
+     (incf *passed-tests*))
+    (t
+     (if *use-html-output-p*
+         (format t "<font color='red'>Test `~S' failed.</font>~%" form)
+         (format t "Test `~S' failed.~%" form))
+     (incf *failed-tests*)))
+  (incf *total-tests*))
+
+(defun expected-failure-fn (condition form)
+  (cond
+    (condition
+     (if *use-html-output-p*
+         (format t "<font color='orange'>Test `~S' passed unexpectedly!</font>~%" form)
+         (format t "Test `~S' passed unexpectedly!~%" form))
+     (incf *unexpected-passes*))
+    (t
+     (format t "Test `~S' failed expectedly.~%" form)
+     (incf *expected-failures*)))
+  (incf *total-tests*))
+
 
 (defmacro test (condition)
-  `(cond
-     (,condition
-      (write-line ,(concat "Test `" (prin1-to-string condition) "' passed"))
-      (incf *passed-tests*))
-     (t
-      (write-line ,(concat "Test `" (prin1-to-string condition) "' failed."))
-      (incf *failed-tests*))))
-
-(write-line "Running tests...")
-(write-line "")
+  `(test-fn ,condition ',condition))
+
+(defmacro expected-failure (condition)
+  `(expected-failure-fn ,condition ',condition))
+
+(defmacro test-equal (form value)
+  `(test (equal ,form, value)))
+
+(format t "Running tests...~%~%")
+(setq *timestamp* (get-internal-real-time))