* test/lunit-report.el: New file split from lunit.el.

[riece] / lisp / test / lunit.el

diff --git a/lisp/test/lunit.el b/lisp/test/lunit.el
index 12120a8..f406032 100644 (file)
--- a/lisp/test/lunit.el
+++ b/lisp/test/lunit.el
@@ -1,6 +1,6 @@
 ;;; lunit.el --- simple testing framework for luna
 
-;; Copyright (C) 2000 Daiki Ueno.
+;; Copyright (C) 2000-2004 Daiki Ueno.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Keywords: OOP, XP
@@ -50,6 +50,8 @@
 
 (eval-when-compile (require 'cl))
 
+(require 'pp)
+
 ;;; @ test
 ;;;
 
@@ -79,6 +81,9 @@
 (put 'lunit-error 'error-message "test error")
 (put 'lunit-error 'error-conditions '(lunit-error error))
 
+(put 'lunit-failure 'error-message "test failure")
+(put 'lunit-failure 'error-conditions '(lunit-failure lunit-error error))
+
 (eval-and-compile
   (luna-define-class lunit-test-result ()
                     (errors
@@ -94,9 +99,6 @@
 (luna-define-generic lunit-test-result-notify (result message &rest args)
   "Report the current state of execution.")
 
-(luna-define-generic lunit-test-result-error (result case error)
-  "Add error to the list of errors.")
-
 (luna-define-generic lunit-test-result-add-listener (result listener)
   "Add listener to the list of listeners.")
 
@@ -115,34 +117,26 @@
   (lunit-test-result-notify result 'lunit-test-listener-start case)
   (condition-case error
       (lunit-test-case-run case)
+    (lunit-failure
+     (lunit-test-result-set-failures-internal
+      result
+      (nconc (lunit-test-result-failures-internal result)
+            (list (cons case (cdr error)))))
+     (lunit-test-result-notify
+      result 'lunit-test-listener-failure case (cdr error)))
     (lunit-error
-     (lunit-test-result-error result case (cdr error))))
+     (lunit-test-result-set-errors-internal
+      result
+      (nconc (lunit-test-result-errors-internal result)
+            (list (cons case (cdr error)))))
+     (lunit-test-result-notify
+      result 'lunit-test-listener-error case (cdr error))))
   (lunit-test-result-set-assert-count-internal
    result
    (+ (lunit-test-result-assert-count-internal result)
       (lunit-test-case-assert-count-internal case)))
-  (let ((failures
-        (lunit-test-case-failures-internal case)))
-    (when failures
-      (lunit-test-result-set-failures-internal
-       result
-       (nconc (lunit-test-result-failures-internal result)
-             (mapcar (lambda (failure)
-                       (prog1 (cons case failure)
-                         (lunit-test-result-notify
-                          result 'lunit-test-listener-failure
-                          case failure)))
-                     failures)))))
   (lunit-test-result-notify result 'lunit-test-listener-end case))
 
-(luna-define-method lunit-test-result-error ((result lunit-test-result)
-                                            case error)
-  (let ((errors
-        (lunit-test-result-errors-internal result)))
-    (setq errors (nconc errors (list (cons case error))))
-    (lunit-test-result-set-errors-internal result errors))
-  (lunit-test-result-notify result 'lunit-test-listener-error case error))
-
 (luna-define-method lunit-test-result-add-listener ((result lunit-test-result)
                                                    listener)
   (let ((listeners
@@ -155,8 +149,7 @@
 
 (eval-and-compile
   (luna-define-class lunit-test-case (lunit-test)
-                    (failures
-                     assert-count))
+                    (assert-count))
 
   (luna-define-internal-accessors 'lunit-test-case))
 
@@ -195,6 +188,8 @@ NAME is name of the method to be tested."
          (error "Method \"%S\" not found" name))
        (condition-case error
            (funcall (car functions) case)
+         (lunit-failure
+          (signal (car error)(cdr error)))
          (error
           (signal 'lunit-error error))))
     (lunit-test-case-teardown case)))
@@ -234,7 +229,8 @@ TESTS holds a number of instances of `lunit-test'."
 
 (defmacro lunit-assert (condition-expr)
   "Verify that CONDITION-EXPR returns non-nil; signal an error if not."
-  (princ "`lunit-assert' is obsolete; use `lunit-assert-2' instead.\n"))
+  `(unless ,condition-expr
+     (signal 'lunit-failure (list ',condition-expr))))
 
 (defmacro lunit-assert-2 (case condition-expr)
   "In regard to CASE, verify that CONDITION-EXPR returns non-nil;
@@ -244,10 +240,7 @@ signal an error if not."
       case
       (1+ (lunit-test-case-assert-count-internal case)))
      (unless ,condition-expr
-       (lunit-test-case-set-failures-internal
-       case
-       (cons ',condition-expr
-             (lunit-test-case-failures-internal case))))))
+       (signal 'lunit-failure (list ',condition-expr)))))
 
 (luna-define-class lunit-test-printer (lunit-test-listener))