Merge branch 'master' of github.com:davazp/jscl

[jscl.git] / tests.lisp

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