r5454: *** empty log message ***

[xlunit.git] / tests.lisp

diff --git a/tests.lisp b/tests.lisp
index ef8ed7cf01b09b19da9a99ed82ee962d48ead6dd..9b519193f16ce4543b49a9a9feb3bd56f42cbb85 100644 (file)
--- 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.8 2003/08/04 17:04:50 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))
@@ -45,13 +45,13 @@
     (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)))))
 
-(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)))))
@@ -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,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