From: Thomas M. Hermann <thomas.m.hermann@odonata-research.com>
Date: Thu, 22 Nov 2012 20:17:41 +0000 (-0600)
Subject: Properly handle the extra results.
X-Git-Tag: 0.9.4~17
X-Git-Url: https://repo.or.cz/w/lisp-unit.git/commitdiff_plain/89e1e2ab6f14cdb6a6e1da5843236c3763ff5830

Properly handle the extra results.
---

diff --git a/lisp-unit.lisp b/lisp-unit.lisp
index c01a483..1e35baa 100644
--- a/lisp-unit.lisp
+++ b/lisp-unit.lisp
@@ -390,7 +390,12 @@ assertion.")
   (with-slots (actual expected) self
     (setf
      actual (multiple-value-list (funcall actual))
-     expected (multiple-value-list (funcall expected)))))
+     expected (multiple-value-list (funcall expected))))
+  ;; Generate extras
+  (when (slot-boundp self 'extras)
+    (setf
+     (slot-value self 'extras)
+     (funcall (slot-value self 'extras)))))
 
 (defclass equal-result (assert-result)
   ()
@@ -676,8 +681,7 @@ assertion.")
   (format t "~& | Failed Form: ~S" (form result))
   (call-next-method)
   (when (extras result)
-    (format t "~{~& | ~S => ~S~}~%"
-            (funcall (extras result))))
+    (format t "~{~& | ~S => ~S~}~%" (extras result)))
   (format t "~& |~%")
   (class-name (class-of result)))