;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
-;;;; ID: $Id: printer.lisp,v 1.6 2003/08/05 22:56:25 kevin Exp $
+;;;; ID: $Id: printer.lisp,v 1.7 2003/08/10 07:39:33 kevin Exp $
;;;; Purpose: Printer functions for XLUnit
;;;;
;;;; *************************************************************************
(let ((count (length defects)))
(if (= 1 count)
(format (ostream obj) "~%There was 1 ~A:~%" title)
- (format (ostream obj) "~%There were ~D A:~%"
+ (format (ostream obj) "~%There were ~D ~A:~%"
count title))
(dotimes (i count)
(let* ((defect (nth i defects))
(condition (thrown-condition defect)))
(format (ostream obj) "~A) ~A: "
(1+ i) (name (failed-test defect)))
- (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))))))))
+ (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)