r5461: *** empty log message ***

[xlunit.git] / tests.lisp

diff --git a/tests.lisp b/tests.lisp
index 2659b84ad3a55cba848c9234546cd9f2e1893507..b91520c21475bd273529b655bbb147c3c32473c7 100644 (file)
--- a/tests.lisp
+++ b/tests.lisp
@@ -2,7 +2,7 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Id:      $Id: tests.lisp,v 1.11 2003/08/05 22:56:25 kevin Exp $
+;;;; Id:      $Id: tests.lisp,v 1.12 2003/08/06 11:37:23 kevin Exp $
 ;;;; Purpose: Self Test suite for XLUnit
 ;;;;
 ;;;; *************************************************************************
@@ -26,21 +26,21 @@
   (setf (ws-log self)
        (concatenate 'string (ws-log self) "teardown ")))
 
-(def-test-method (test-method self was-run :run nil)
+(def-test-method test-method ((self was-run) :run nil)
     (setf (ws-log self) 
       (concatenate 'string (ws-log self) "test-method ")))
 
-(def-test-method (test-broken-method self was-run :run nil)
+(def-test-method test-broken-method ((self was-run) :run nil)
     (assert-equal pi (/ 22 7)))
 
-(def-test-method (test-not-eql self was-run :run nil)
+(def-test-method test-not-eql ((self was-run) :run nil)
     (assert-not-eql (cons t t) (cons t t)))
 
-(def-test-method (test-eql self was-run :run nil)
+(def-test-method test-eql ((self was-run) :run nil)
     (let ((obj (cons t t)))
       (assert-eql obj obj)))
 
-(def-test-method (test-error-method self was-run :run nil)
+(def-test-method test-error-method ((self was-run) :run nil)
     (error "Err"))
 
 
@@ -49,10 +49,10 @@
 (defclass test-two-cases (test-case)
   ())
 
-(def-test-method (test-1 self test-two-cases :run nil)
+(def-test-method test-1 ((self test-two-cases) :run nil)
     (assert-true t))
 
-(def-test-method (test-2 self test-two-cases :run nil)
+(def-test-method test-2 ((self test-two-cases) :run nil)
     (assert-false nil))
 
 ;;; Main test fixture
@@ -61,26 +61,26 @@
   ())
 
 
-(def-test-method (test-template-method self test-case-test :run nil)
+(def-test-method test-template-method ((self test-case-test) :run nil)
   (let ((test (named-test 'test-method (get-suite was-run))))
     (run test)
     (assert-equal (ws-log test) "setup test-method teardown ")))
 
-(def-test-method (test-results self test-case-test :run nil)
+(def-test-method test-results ((self test-case-test) :run nil)
   (assert-equal "1 run, 0 erred, 0 failed" 
                (summary (run (named-test 'test-method 
                                          (get-suite was-run))))))
 
-(def-test-method (test-eql self test-case-test :run nil)
+(def-test-method test-eql ((self test-case-test) :run nil)
   (assert-equal "1 run, 0 erred, 0 failed" 
                (summary (run (named-test 'test-eql (get-suite was-run))))))
 
-(def-test-method (test-not-eql self test-case-test :run nil)
+(def-test-method test-not-eql ((self test-case-test) :run nil)
   (assert-equal "1 run, 0 erred, 0 failed" 
                (summary (run (named-test 'test-not-eql
                                          (get-suite was-run))))))
 
-(def-test-method (test-fn self test-case-test :run nil)
+(def-test-method test-fn ((self test-case-test) :run nil)
   (let ((test (make-instance 'test-case :name 'test-fn
                              :method-body
                              (lambda () 
@@ -89,19 +89,19 @@
     (assert-equal "1 run, 0 erred, 0 failed"
                  (summary (run test)))))
 
-(def-test-method (test-failed-result self test-case-test :run nil)
+(def-test-method test-failed-result ((self test-case-test) :run nil)
   (assert-equal "1 run, 0 erred, 1 failed"
                (summary (run
                          (named-test 'test-broken-method
                                      (get-suite was-run))))))
 
-(def-test-method (test-error-result self test-case-test :run nil)
+(def-test-method test-error-result ((self test-case-test) :run nil)
     (assert-equal "1 run, 1 erred, 0 failed"
                  (summary (run
                            (named-test 'test-error-method
                                        (get-suite was-run))))))
   
-(def-test-method (test-suite self test-case-test :run nil)
+(def-test-method test-suite ((self test-case-test) :run nil)
   (let ((suite (make-instance 'test-suite))
        (result (make-test-results)))
     (add-test suite (named-test 'test-method (get-suite was-run)))
@@ -109,7 +109,7 @@
     (run-on-test-results suite result)
     (assert-equal "2 run, 0 erred, 1 failed" (summary result))))
 
-(def-test-method (test-dynamic-suite self test-case-test :run nil)
+(def-test-method test-dynamic-suite ((self test-case-test) :run nil)
   (assert-equal "2 run, 0 erred, 0 failed" 
                (summary (run (get-suite test-two-cases)))))