X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests.lisp;h=892a0335d7fc528d2d3a4d6fada16dc934e40edd;hb=53c699a7ed91f78c0e31b7bbd7deda671ca9df05;hp=101125a21730ba790a91f89cf33ba6aa13dd11e7;hpb=34803ef0f0a02430b51382e7684f6d775d135953;p=xlunit.git

diff --git a/tests.lisp b/tests.lisp
index 101125a..892a033 100644
--- a/tests.lisp
+++ b/tests.lisp
@@ -2,23 +2,23 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:        tests.lisp
-;;;; Purpose:     Test suite for XLUnit
-;;;; Author:     Kevin Rosenberg
+;;;; Id:      $Id: tests.lisp,v 1.6 2003/08/04 12:28:46 kevin Exp $
+;;;; Purpose: Test suite for XLUnit
 ;;;;
-;;;; Put in public domain by Kevin Rosenberg
-;;;; $Id: tests.lisp,v 1.3 2003/08/04 09:50:33 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)
   ((log :accessor ws-log)))
 
-
 (defmethod setup ((self was-run))
   (setf (ws-log self) "setup "))
 
@@ -34,57 +34,56 @@
 (defmethod test-error-method ((self was-run))
   (error "Err"))
 
-(defclass test-case-test (test-fixture)
-  ((result :accessor result)))
 
-(defmethod setup ((self test-case-test))
-  (setf (result self) (make-instance 'test-result)))
+;;; Main test fixture
+
+(defclass test-case-test (test-fixture)
+  ())
 
 (defmethod test-template-method ((self test-case-test))
   (let ((test (make-test 'was-run 'test-method)))
-    (run-test test (result self))
+    (run-test test)
     (assert-equal (ws-log test) "setup test-method teardown ")))
 
 (defmethod test-result ((self test-case-test))
-  (let ((test (make-test 'was-run 'test-method)))
-    (run-test test (result self))
-    (assert-equal "1 run, 0 errored, 0 failed" (summary (result self)))))
+  (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)))))
-    (run-test test (result self))
-    (assert-equal "1 run, 0 errored, 0 failed"
-		  (summary (result self)))))
+    (assert-equal "1 run, 0 erred, 0 failed"
+		  (summary (run-test test)))))
 
 (defmethod test-failed-result ((self test-case-test))
-  (let ((test (make-test 'was-run 'test-broken-method)))
-    (run-test test (result self))
-    (assert-equal "1 run, 0 errored, 1 failed"
-		  (summary (result self)))))
+  (assert-equal "1 run, 0 erred, 1 failed"
+		(summary (run-test
+			  (make-test 'was-run 'test-broken-method)))))
 
 (defmethod test-error-result ((self test-case-test))
-  (let ((test (make-test 'was-run 'test-error-method)))
-    (run-test test (result self))
-    (assert-equal "1 run, 1 errored, 0 failed"
-		  (summary (result self)))))
-
+  (assert-equal "1 run, 1 erred, 0 failed"
+		(summary (run-test
+			  (make-test 'was-run 'test-error-method)))))
+  
 (defmethod test-suite ((self test-case-test))
-  (let ((suite (make-test-suite "TestSuite")))
+  (let ((suite (make-test-suite "TestSuite"))
+	(result (make-test-result)))
     (add-test (make-test 'was-run 'test-method) suite)
     (add-test (make-test 'was-run 'test-broken-method) suite)
-    (run-test suite (result self)))
-  (assert-equal "2 run, 0 errored, 1 failed" 
-		(summary (result self))))
+    (run-test suite :result result)
+    (assert-equal "2 run, 0 erred, 1 failed" (summary result))))
 
 (defmethod test-dynamic-suite ((self test-case-test))
-  (let ((suite (make-test-suite 'was-run)))
-    (run-test suite (result self)))
-  (assert-equal "3 run, 1 errored, 1 failed" 
-		(summary (result self))))
+  (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)
 
-(text-testrunner (make-test-suite 'test-case-test))
 
+(defun do-tests ()
+  (or (was-successful 
+       (run-test (make-test-suite 'test-case-test)))
+      (error "Failed tests")))