r5457: *** empty log message ***

[xlunit.git] / printer.lisp

diff --git a/printer.lisp b/printer.lisp
index 729e0839e129a8814553a37e70872315f33add25..3637ff454f4b1c49e069a21f676e55d19040fa82 100644 (file)
--- a/printer.lisp
+++ b/printer.lisp
@@ -2,7 +2,7 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; ID:      $Id: printer.lisp,v 1.3 2003/08/04 16:13:58 kevin Exp $
+;;;; ID:      $Id: printer.lisp,v 1.5 2003/08/04 19:31:34 kevin Exp $
 ;;;; Purpose: Printer functions for XLUnit
 ;;;;
 ;;;; *************************************************************************
@@ -41,7 +41,8 @@
       (let ((i 1))
         (mapc #'(lambda (single-error)
                   (format (ostream ob) "~a) ~a: ~a~%" i
-                          (name (car single-error)) (cdr single-error))
+                          (name (failed-test single-error))
+                         (thrown-condition single-error))
                   (incf i))
               errors)))))
 
@@ -53,43 +54,13 @@
         (format (ostream ob) "~%There were ~a failures:~%" (length failures)))
       (let ((i 1))
         (mapc #'(lambda (single-failure)
-                  (format (ostream ob) "~a) ~a: ~a~%" i (name (car single-failure))
-                          (or (message (cdr single-failure)) ""))
+                  (format (ostream ob) "~a) ~a: ~a~%" i 
+                         (name (failed-test single-failure))
+                          (or (message (thrown-condition single-failure)) ""))
                   (incf i))
               failures)))))
 
-#|
-(defun result-printer (result seconds stream)
-  (format stream "~&Time: ~D~%~%" (coerce seconds 'float))
-  (print-defects (errors result) "error" stream)
-  (print-defects (failures result) "failure" stream)
-  (if (was-successful result)
-      (format stream "OK (~D tests)~%" (run-count result))
-    (progn
-      (format stream "~%FAILURES!!!~%")
-      (format stream "Tests run: ~D, Failures: ~D, Errors: ~D~%"
-             (run-count result) (failure-count result)
-             (error-count result)))))
-
-(defun print-defects (defects type stream)
-  (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))
-      (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))))))
-
-|#
-
 (defgeneric summary (result))
-(defmethod summary ((result test-result))
+(defmethod summary ((result test-results))
   (format nil "~D run, ~D erred, ~D failed"
-         (run-count result) (error-count result) (failure-count result)))
+         (run-tests result) (error-count result) (failure-count result)))