X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests.lisp;h=b14b68919525d47c85ef211e0af7b1c7f7dd9800;hb=8e9bc32063b4197e64863afa179ba09e85737a05;hp=9b519193f16ce4543b49a9a9feb3bd56f42cbb85;hpb=381a23bb7ab8dd206bcd430ce9c7ee9c53e52f13;p=xlunit.git diff --git a/tests.lisp b/tests.lisp index 9b51919..b14b689 100644 --- a/tests.lisp +++ b/tests.lisp @@ -2,8 +2,8 @@ ;;;; ************************************************************************* ;;;; FILE IDENTIFICATION ;;;; -;;;; Id: $Id: tests.lisp,v 1.8 2003/08/04 17:04:50 kevin Exp $ -;;;; Purpose: Test suite for XLUnit +;;;; Id: $Id$ +;;;; Purpose: Self Test suite for XLUnit ;;;; ;;;; ************************************************************************* @@ -13,77 +13,147 @@ (:export #:do-tests)) (in-package #:xlunit-tests) +(define-condition test-condition (error) + ()) + ;; Helper test fixture (defclass was-run (test-case) ((log :accessor ws-log))) -(defmethod setup ((self was-run)) - (setf (ws-log self) "setup ")) +(defmethod set-up ((self was-run)) + (setf (ws-log self) "setup ")) + +(defmethod tear-down ((self was-run)) + (setf (ws-log self) + (concatenate 'string (ws-log self) "teardown "))) + +(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) + (assert-equal pi (/ 22 7))) + +(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) + (let ((obj (cons t t))) + (assert-eql obj obj))) + +(def-test-method test-error-method ((self was-run) :run nil) + (error "Err")) + +(def-test-method test-condition-without-cond ((self was-run) :run nil) + (assert-condition 'error (list 'no-error))) + +#+ignore +(def-test-method test-not-condition-with-cond ((self was-run) :run nil) + (assert-not-condition 'test-condition + (signal 'test-condition))) -(defmethod teardown ((self was-run)) - (setf (ws-log self) (concatenate 'string (ws-log self) "teardown "))) -(defmethod test-method ((self was-run)) - (setf (ws-log self) (concatenate 'string (ws-log self) "test-method "))) +;;; Second helper test case -(defmethod test-broken-method ((self was-run)) - (assert-equal pi (/ 22 7))) +(defclass test-two-cases (test-case) + ()) -(defmethod test-error-method ((self was-run)) - (error "Err")) +(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) + (assert-false nil)) ;;; Main test fixture (defclass test-case-test (test-case) ()) -(defmethod test-template-method ((self test-case-test)) - (let ((test (make-test 'was-run 'test-method))) - (run-test test) + +(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 "))) -(defmethod test-results ((self test-case-test)) +(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) + (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) (assert-equal "1 run, 0 erred, 0 failed" - (summary (run-test (make-test 'was-run 'test-method))))) - -(defmethod test-fn ((self test-case-test)) - (let ((test (make-test 'was-run '"Test Failure" - :test-fn - (lambda (test) - (declare (ignore test)) - (assert-equal 10 10))))) + (summary (run (named-test 'test-not-eql + (get-suite was-run)))))) + +(def-test-method test-fn ((self test-case-test) :run nil) + (let ((test (make-instance 'test-case :name 'test-fn + :method-body + (lambda () + (declare (ignore test)) + (assert-equal 10 10))))) (assert-equal "1 run, 0 erred, 0 failed" - (summary (run-test test))))) + (summary (run test))))) -(defmethod test-failed-result ((self test-case-test)) +(def-test-method test-failed-result ((self test-case-test) :run nil) (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)) - (assert-equal "1 run, 1 erred, 0 failed" - (summary (run-test - (make-test 'was-run 'test-error-method))))) + (summary (run + (named-test 'test-broken-method + (get-suite was-run)))))) + +(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)))))) -(defmethod test-suite ((self test-case-test)) - (let ((suite (make-test-suite "TestSuite")) +(def-test-method test-suite ((self test-case-test) :run nil) + (let ((suite (make-instance 'test-suite)) (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) + (add-test suite (named-test 'test-method (get-suite was-run))) + (add-test suite (named-test 'test-broken-method (get-suite was-run))) + (run-on-test-results suite result) (assert-equal "2 run, 0 erred, 1 failed" (summary result)))) -(defmethod test-dynamic-suite ((self test-case-test)) - (assert-equal "3 run, 1 erred, 1 failed" - (summary (run-test (make-test-suite 'was-run))))) +(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))))) + +(def-test-method test-condition ((self test-case-test) :run nil) + (assert-condition + 'test-condition + (error 'test-condition))) -(textui-test-run (make-test-suite 'test-case-test) :handle-errors nil) +(def-test-method test-condition-without-cond ((self test-case-test) + :run nil) + (assert-equal "1 run, 0 erred, 1 failed" + (summary (run + (named-test 'test-condition-without-cond + (get-suite was-run)))))) + +#+ignore +(def-test-method test-not-condition ((self test-case-test) :run nil) + (assert-not-condition + 'test-condition + (progn))) + +#+ignore +(def-test-method test-not-condition-with-cond ((self test-case-test) + :run nil) + (assert-equal "1 run, 0 erred, 1 failed" + (summary (run + (named-test 'test-not-condition-with-cond + (get-suite was-run)))))) + +#+ignore +(textui-test-run (get-suite test-case-test)) (defun do-tests () - (or (was-successful - (run-test (make-test-suite 'test-case-test))) + (or (was-successful (run (get-suite test-case-test))) (error "Failed tests")))