r5454: *** empty log message ***

[xlunit.git] / tests.lisp

diff --git a/tests.lisp b/tests.lisp
index 892a0335d7fc528d2d3a4d6fada16dc934e40edd..9b519193f16ce4543b49a9a9feb3bd56f42cbb85 100644 (file)
--- a/tests.lisp
+++ b/tests.lisp
@@ -2,7 +2,7 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Id:      $Id: tests.lisp,v 1.6 2003/08/04 12:28:46 kevin Exp $
+;;;; Id:      $Id: tests.lisp,v 1.8 2003/08/04 17:04:50 kevin Exp $
 ;;;; Purpose: Test suite for XLUnit
 ;;;;
 ;;;; *************************************************************************
@@ -16,7 +16,7 @@
 
 ;; Helper test fixture
 
-(defclass was-run (test-fixture)
+(defclass was-run (test-case)
   ((log :accessor ws-log)))
 
 (defmethod setup ((self was-run))
@@ -37,7 +37,7 @@
 
 ;;; Main test fixture
 
-(defclass test-case-test (test-fixture)
+(defclass test-case-test (test-case)
   ())
 
 (defmethod test-template-method ((self test-case-test))
@@ -45,7 +45,7 @@
     (run-test test)
     (assert-equal (ws-log test) "setup test-method teardown ")))
 
-(defmethod test-result ((self test-case-test))
+(defmethod test-results ((self test-case-test))
   (assert-equal "1 run, 0 erred, 0 failed" 
                (summary (run-test (make-test 'was-run 'test-method)))))
 
@@ -70,7 +70,7 @@
   
 (defmethod test-suite ((self test-case-test))
   (let ((suite (make-test-suite "TestSuite"))
-       (result (make-test-result)))
+       (result (make-test-results)))
     (add-test (make-test 'was-run 'test-method) suite)
     (add-test (make-test 'was-run 'test-broken-method) suite)
     (run-test suite :result result)
@@ -80,7 +80,7 @@
   (assert-equal "3 run, 1 erred, 1 failed" 
                (summary (run-test (make-test-suite 'was-run)))))
 
-(text-testrunner (make-test-suite 'test-case-test) :handle-errors nil)
+(textui-test-run (make-test-suite 'test-case-test) :handle-errors nil)
 
 
 (defun do-tests ()