X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests.lisp;h=4c741c643993ee7e57156f2ba418a8f32d3a34e3;hb=4989cbba70f7b820baef37d4f4f04e8546c5fd76;hp=6fce25e807f9a4b880ae560c93f49be8eaa834a2;hpb=1cd3b2403660569e2983ce646fbf0d364fbfefe5;p=jscl.git

diff --git a/tests.lisp b/tests.lisp
index 6fce25e..4c741c6 100644
--- a/tests.lisp
+++ b/tests.lisp
@@ -1,22 +1,22 @@
-(defvar *total-tests* 0)
-(defvar *passed-tests* 0)
-(defvar *failed-tests* 0)
-
-(defvar *expected-failures* 0)
-(defvar *unexpected-passes* 0)
+(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)
   `(progn
      (cond
        (,condition
-        (write-line ,(concat "Test `" (prin1-to-string condition) "' passed"))
+        (format t "Test `~S' passed~%" ',condition)
         (incf *passed-tests*))
        (t
-        (write-line ,(concat "<font color=red>Test `"
-                             (prin1-to-string condition) 
-                             "' failed.</font>"))
+        (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*)))
 
@@ -24,16 +24,18 @@
   `(progn
      (cond
        (,condition
-        (write-line ,(concat "<font color=orange>Test `"
-                             (prin1-to-string condition)
-                             "' passed unexpectedly!</font>"))
+        (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
-        (write-line ,(concat "Test `" (prin1-to-string condition) "' failed expectedly."))
+        (format t "Test `~S' failed failed expectedly.~%" ',condition)
         (incf *expected-failures*)))
      (incf *total-tests*)))
 
-(write-line "Running tests...")
-(write-line "")
+(defmacro test-equal (form value)
+  `(test (equal ,form, value)))
+
 
+(format t "Running tests...~%~%")
 (setq *timestamp* (get-internal-real-time))