X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests.lisp;h=e5cfb41dfc2b8856c2eef3a8d275f6e2d2f13bc7;hb=53e193feda5d4cb757ef13d622fac03cf99178a2;hp=ef8ed7cf01b09b19da9a99ed82ee962d48ead6dd;hpb=318cda1a328e9d99af2270c73cb13262e485a1ff;p=xlunit.git

diff --git a/tests.lisp b/tests.lisp
index ef8ed7c..e5cfb41 100644
--- a/tests.lisp
+++ b/tests.lisp
@@ -2,22 +2,21 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:        tests.lisp
-;;;; Purpose:     Test suite for XLUnit
-;;;; Author:     Kevin Rosenberg
+;;;; Id:      $Id: tests.lisp,v 1.7 2003/08/04 16:13:58 kevin Exp $
+;;;; Purpose: Test suite for XLUnit
 ;;;;
-;;;; Put in public domain by Kevin Rosenberg
-;;;; $Id: tests.lisp,v 1.4 2003/08/04 12:01:54 kevin Exp $
 ;;;; *************************************************************************
 
+(in-package #:cl-user)
 (defpackage #:xlunit-tests
-  (:use #:cl #:xlunit))
-
+  (:use #:cl #:xlunit)
+  (:export #:do-tests))
 (in-package #:xlunit-tests)
 
 
 ;; Helper test fixture
-(defclass was-run (test-fixture)
+
+(defclass was-run (test-case)
   ((log :accessor ws-log)))
 
 (defmethod setup ((self was-run))
@@ -35,9 +34,10 @@
 (defmethod test-error-method ((self was-run))
   (error "Err"))
 
+
 ;;; Main test fixture
 
-(defclass test-case-test (test-fixture)
+(defclass test-case-test (test-case)
   ())
 
 (defmethod test-template-method ((self test-case-test))
@@ -49,9 +49,9 @@
   (assert-equal "1 run, 0 erred, 0 failed" 
 		(summary (run-test (make-test 'was-run 'test-method)))))
 
-(defmethod test-thunk ((self test-case-test))
+(defmethod test-fn ((self test-case-test))
   (let ((test (make-test 'was-run '"Test Failure"
-			 :test-thunk
+			 :test-fn
 			 (lambda (test) 
 			   (declare (ignore test))
 			   (assert-equal 10 10)))))
@@ -80,7 +80,8 @@
   (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 ()
   (or (was-successful