X-Git-Url: http://git.kpe.io/?p=xlunit.git;a=blobdiff_plain;f=printer.lisp;h=a590a3b79e32825247605d6e52326d6658d8ec7f;hp=16f1bdb85cac9514678037fc5d771e2cc8edef34;hb=HEAD;hpb=318cda1a328e9d99af2270c73cb13262e485a1ff

diff --git a/printer.lisp b/printer.lisp
index 16f1bdb..a590a3b 100644
--- a/printer.lisp
+++ b/printer.lisp
@@ -2,45 +2,68 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:        printer.lisp
-;;;; Purpose:     Printer functions for XLUnit
-;;;; Authors:     Kevin Rosenberg
+;;;; ID:      $Id$
+;;;; Purpose: Printer functions for XLUnit
 ;;;;
-;;;; $Id: printer.lisp,v 1.1 2003/08/04 12:01:54 kevin Exp $
 ;;;; *************************************************************************
 
 (in-package #:xlunit)
 
 
-(defun result-printer (result seconds stream)
-  (format stream "~&Time: ~D~%~%" (coerce seconds 'float))
-  (print-defects (test-errors result) "error" stream)
-  (print-defects (test-failures result) "failure" stream)
-  (if (was-successful result)
-      (format stream "OK (~D tests)~%" (test-count result))
-    (progn
-      (format stream "~%FAILURES!!!~%")
-      (format stream "Tests run: ~D, Failures: ~D, Errors: ~D~%"
-	      (test-count result) (length (test-failures result))
-	      (length (test-errors result))))))
+;----------------------------------------------------------------------
+; method print-results
+;----------------------------------------------------------------------
 
-(defun print-defects (defects type stream)
+(defmethod print-results ((obj textui-test-runner) result seconds)
+  (print-header obj result seconds)
+  (print-defects obj (errors result) "error")
+  (print-defects obj (failures result) "failure")
+  (print-footer obj result)
+  (values))
+
+(defmethod print-header ((obj textui-test-runner) result seconds)
+  (declare (ignore result))
+  (format (ostream obj) "~&Time: ~D~%~%" (coerce seconds 'float)))
+
+(defmethod print-defects ((obj textui-test-runner) defects title)
   (when defects
     (let ((count (length defects)))
-      (if (= count 1)
-	  (format stream "~&There was ~D ~A:~%" count type)
-	(format stream "~&There were ~D ~As:~%" count type))
+      (if (= 1 count)
+          (format (ostream obj) "~%There was 1 ~A:~%" title)
+        (format (ostream obj) "~%There were ~D ~A:~%"
+                count title))
       (dotimes (i count)
-	(let ((defect (nth i defects)))
-	  (format stream "~&~D) ~A " i (class-name
-					(class-of (failed-test defect))))
-	  (apply #'format stream (simple-condition-format-control 
-				  (thrown-condition defect))
-		 (simple-condition-format-arguments 
-		  (thrown-condition defect)))
-	  (fresh-line stream))))))
-
-(defmethod summary ((result test-result))
+        (let* ((defect (nth i defects))
+               (condition (thrown-condition defect)))
+          (format (ostream obj) "~A) ~A: "
+                  (1+ i) (name (failed-test defect)))
+          (typecase condition
+            (assertion-failed
+             (apply #'format (ostream obj)
+                    (simple-condition-format-control condition)
+                    (simple-condition-format-arguments condition))
+             (format (ostream obj) "~%")
+             (when (message condition)
+               (let ((spaces (+ 2 (length (format nil "~D" count)))))
+                 (dotimes (i spaces)
+                   (write-char #\space (ostream obj))))
+               (format (ostream obj) "~A~%" (message condition))))
+            (t
+             (format (ostream obj) "~A~%" condition))))))))
+
+
+(defmethod print-footer ((obj textui-test-runner) result)
+  (let ((failures (failures result))
+        (errors (errors result))
+        (run-tests (run-tests result)))
+    (cond ((and (null failures) (null errors))
+           (format (ostream obj) "~%OK (~a tests)~%" run-tests))
+          (t
+           (format (ostream obj) "~%~%FAILURES!!!~%")
+           (format (ostream obj) "Run: ~a   Failures: ~a   Errors: ~a~%"
+                   run-tests (length failures) (length errors))))))
+
+(defgeneric summary (result))
+(defmethod summary ((result test-results))
   (format nil "~D run, ~D erred, ~D failed"
-	  (test-count result) (length (test-errors result))
-	  (length (test-failures result))))
+          (run-tests result) (error-count result) (failure-count result)))