X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcheck.lisp;h=21f7bf4981c51832c47927a8ffe76f973183298e;hb=b76fc6a27dc451c7f2f88eb9a1f028228530af6c;hp=e91b46df8351bee8cfd3679aab6da056fd5673fb;hpb=c2915e382b980c12abd77a686f2d796ada69d172;p=fiveam.git diff --git a/src/check.lisp b/src/check.lisp index e91b46d..21f7bf4 100644 --- a/src/check.lisp +++ b/src/check.lisp @@ -1,6 +1,6 @@ -;; -*- lisp -*- +;;;; -*- Mode: Lisp; indent-tabs-mode: nil -*- -(in-package :it.bese.FiveAM) +(in-package :it.bese.fiveam) ;;;; * Checks @@ -29,7 +29,7 @@ ;;;; ** Types of test results -;;;; Every check produces a result object. +;;;; Every check produces a result object. (defclass test-result () ((reason :accessor reason :initarg :reason :initform "no reason given") @@ -58,9 +58,9 @@ (defmacro process-failure (&rest args) `(progn - (with-simple-restart (ignore-failure "Continue the test run.") - (error 'check-failure ,@args)) - (add-result 'test-failure ,@args))) + (with-simple-restart (ignore-failure "Continue the test run.") + (error 'check-failure ,@args)) + (add-result 'test-failure ,@args))) (defclass test-failure (test-result) () @@ -97,10 +97,10 @@ when appropiate.")) (let ((result (apply #'make-instance result-type (append make-instance-args (list :test-case current-test))))) (etypecase result - (test-passed (format *test-dribble* ".")) + (test-passed (format *test-dribble* ".")) (unexpected-test-failure (format *test-dribble* "X")) - (test-failure (format *test-dribble* "f")) - (test-skipped (format *test-dribble* "s"))) + (test-failure (format *test-dribble* "f")) + (test-skipped (format *test-dribble* "s"))) (push result result-list)))) ;;;; ** The check operators @@ -111,9 +111,8 @@ when appropiate.")) "The DWIM checking operator. If TEST returns a true value a test-passed result is generated, -otherwise a test-failure result is generated and the reason, -unless REASON-ARGS is provided, is generated based on the form of -TEST: +otherwise a test-failure result is generated. The reason, unless +REASON-ARGS is provided, is generated based on the form of TEST: (predicate expected actual) - Means that we want to check whether, according to PREDICATE, the ACTUAL value is @@ -122,35 +121,68 @@ TEST: (predicate value) - Means that we want to ensure that VALUE satisfies PREDICATE. -Wrapping the TEST form in a NOT simply preducse a negated reason string." + Wrapping the TEST form in a NOT simply produces a negated reason + string." (assert (listp test) (test) "Argument to IS must be a list, not ~S" test) (let (bindings effective-test default-reason-args) - (with-unique-names (e a v) - (list-match-case test - ((not (?predicate ?expected ?actual)) - (setf bindings (list (list e ?expected) - (list a ?actual)) - effective-test `(not (,?predicate ,e ,a)) - default-reason-args (list "~S was ~S to ~S" a `',?predicate e))) - ((not (?satisfies ?value)) - (setf bindings (list (list v ?value)) - effective-test `(not (,?satisfies ,v)) - default-reason-args (list "~S satisfied ~S" v `',?satisfies))) - ((?predicate ?expected ?actual) - (setf bindings (list (list e ?expected) - (list a ?actual)) - effective-test `(,?predicate ,e ,a) - default-reason-args (list "~S was not ~S to ~S" a `',?predicate e))) - ((?satisfies ?value) - (setf bindings (list (list v ?value)) - effective-test `(,?satisfies ,v) - default-reason-args (list "~S did not satisfy ~S" v `',?satisfies))) - (?_ - (setf bindings '() - effective-test test - default-reason-args (list "No reason supplied")))) + (with-gensyms (e a v) + (flet ((process-entry (predicate expected actual &optional negatedp) + ;; make sure EXPECTED is holding the entry that starts with 'values + (when (and (consp actual) + (eq (car actual) 'values)) + (assert (not (and (consp expected) + (eq (car expected) 'values))) () + "Both the expected and actual part is a values expression.") + (rotatef expected actual)) + (let ((setf-forms)) + (if (and (consp expected) + (eq (car expected) 'values)) + (progn + (setf expected (copy-list expected)) + (setf setf-forms (loop for cell = (rest expected) then (cdr cell) + for i from 0 + while cell + when (eq (car cell) '*) + collect `(setf (elt ,a ,i) nil) + and do (setf (car cell) nil))) + (setf bindings (list (list e `(list ,@(rest expected))) + (list a `(multiple-value-list ,actual))))) + (setf bindings (list (list e expected) + (list a actual)))) + (setf effective-test `(progn + ,@setf-forms + ,(if negatedp + `(not (,predicate ,e ,a)) + `(,predicate ,e ,a))))))) + (list-match-case test + ((not (?predicate ?expected ?actual)) + (process-entry ?predicate ?expected ?actual t) + (setf default-reason-args + (list "~S evaluated to ~S, which is ~S to ~S (it should not be)" + `',?actual a `',?predicate e))) + ((not (?satisfies ?value)) + (setf bindings (list (list v ?value)) + effective-test `(not (,?satisfies ,v)) + default-reason-args + (list "~S evaluated to ~S, which satisfies ~S (it should not)" + `',?value v `',?satisfies))) + ((?predicate ?expected ?actual) + (process-entry ?predicate ?expected ?actual) + (setf default-reason-args + (list "~S evaluated to ~S, which is not ~S to ~S." + `',?actual a `',?predicate e))) + ((?satisfies ?value) + (setf bindings (list (list v ?value)) + effective-test `(,?satisfies ,v) + default-reason-args + (list "~S evaluated to ~S, which does not satisfy ~S" + `',?value v `',?satisfies))) + (?_ + (setf bindings '() + effective-test test + default-reason-args (list "~S was NIL." `',test))))) `(let ,bindings (if ,effective-test (add-result 'test-passed :test-expr ',test) @@ -165,31 +197,46 @@ Wrapping the TEST form in a NOT simply preducse a negated reason string." (format *test-dribble* "s") (add-result 'test-skipped :reason (format nil ,@reason)))) +(defmacro is-every (predicate &body clauses) + "The input is either a list of lists, or a list of pairs. Generates (is (,predicate ,expr ,value)) + for each pair of elements or (is (,predicate ,expr ,value) ,@reason) for each list." + `(progn + ,@(if (every #'consp clauses) + (loop for (expected actual . reason) in clauses + collect `(is (,predicate ,expected ,actual) ,@reason)) + (progn + (assert (evenp (list-length clauses))) + (loop for (expr value) on clauses by #'cddr + collect `(is (,predicate ,expr ,value))))))) + (defmacro is-true (condition &rest reason-args) "Like IS this check generates a pass if CONDITION returns true and a failure if CONDITION returns false. Unlike IS this check does not inspect CONDITION to determine how to report the failure." `(if ,condition - (add-result 'test-passed :test-expr ',condition) - (process-failure - :reason ,(if reason-args - `(format nil ,@reason-args) - `(format nil "~S did not return a true value" ',condition)) - :test-expr ',condition))) + (add-result 'test-passed :test-expr ',condition) + (process-failure + :reason ,(if reason-args + `(format nil ,@reason-args) + `(format nil "~S did not return a true value" ',condition)) + :test-expr ',condition))) (defmacro is-false (condition &rest reason-args) "Generates a pass if CONDITION returns false, generates a failure otherwise. Like IS-TRUE, and unlike IS, IS-FALSE does not inspect CONDITION to determine what reason to give it case of test failure" - `(if ,condition - (process-failure - :reason ,(if reason-args - `(format nil ,@reason-args) - `(format nil "~S returned a true value" ',condition)) - :test-expr ',condition) - (add-result 'test-passed :test-expr ',condition))) + + (with-gensyms (value) + `(let ((,value ,condition)) + (if ,value + (process-failure + :reason ,(if reason-args + `(format nil ,@reason-args) + `(format nil "~S returned the value ~S, which is true" ',condition ,value )) + :test-expr ',condition) + (add-result 'test-passed :test-expr ',condition))))) (defmacro signals (condition-spec &body body) @@ -203,7 +250,7 @@ not evaluated." (handler-bind ((,condition (lambda (c) (declare (ignore c)) ;; ok, body threw condition - (add-result 'test-passed + (add-result 'test-passed :test-expr ',condition) (return-from ,block-name t)))) (block nil @@ -221,18 +268,18 @@ other words if body does signal, return-from or throw this test fails." `(let ((ok nil)) (unwind-protect - (progn - ,@body - (setf ok t)) + (progn + ,@body + (setf ok t)) (if ok - (add-result 'test-passed :test-expr ',body) + (add-result 'test-passed :test-expr ',body) (process-failure :reason (format nil "Test didn't finish") :test-expr ',body))))) (defmacro pass (&rest message-args) "Simply generate a PASS." - `(add-result 'test-passed + `(add-result 'test-passed :test-expr ',message-args ,@(when message-args `(:reason (format nil ,@message-args))))) @@ -245,15 +292,15 @@ fails." `(:reason (format nil ,@message-args))))) ;; Copyright (c) 2002-2003, Edward Marco Baringer -;; All rights reserved. -;; +;; All rights reserved. +;; ;; Redistribution and use in source and binary forms, with or without ;; modification, are permitted provided that the following conditions are ;; met: -;; +;; ;; - Redistributions of source code must retain the above copyright ;; notice, this list of conditions and the following disclaimer. -;; +;; ;; - Redistributions in binary form must reproduce the above copyright ;; notice, this list of conditions and the following disclaimer in the ;; documentation and/or other materials provided with the distribution. @@ -261,7 +308,7 @@ fails." ;; - Neither the name of Edward Marco Baringer, nor BESE, nor the names ;; of its contributors may be used to endorse or promote products ;; derived from this software without specific prior written permission. -;; +;; ;; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ;; "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ;; LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR