Mercurial > hg > xemacs-beta

comparison tests/automated/test-harness.el @ 4747:294a86d29f99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Eliminate C asserts from c-tests.
author Stephen J. Turnbull <stephen@xemacs.org>
date Mon, 16 Nov 2009 12:00:38 +0900
parents bceb3e285ae7
children a3c673c0720b
comparison
equal deleted inserted replaced
4746:ae862598ee56 4747:294a86d29f99
265 (puthash ,reason (if (null count) 1 (1+ count)) 265 (puthash ,reason (if (null count) 1 (1+ count))
266 skipped-test-reasons) 266 skipped-test-reasons)
267 (Print-Skip ,description ,reason)) 267 (Print-Skip ,description ,reason))
268 ,@body)) 268 ,@body))
269 269
270 (defmacro Assert (assertion &optional failing-case) 270 (defmacro Assert (assertion &optional failing-case description)
271 "Test passes if ASSERTION is true.
272 Optional FAILING-CASE describes the particular failure.
273 Optional DESCRIPTION describes the assertion.
274 FAILING-CASE and DESCRIPTION are useful when Assert is used in a loop."
271 `(condition-case error-info 275 `(condition-case error-info
272 (progn 276 (progn
273 (assert ,assertion) 277 (assert ,assertion)
274 (Print-Pass "%S" (quote ,assertion)) 278 (Print-Pass "%S" (quote ,(or description assertion)))
275 (incf passes)) 279 (incf passes))
276 (cl-assertion-failed 280 (cl-assertion-failed
277 (Print-Failure (if ,failing-case 281 (Print-Failure (if ,failing-case
278 "Assertion failed: %S; failing case = %S" 282 "Assertion failed: %S; failing case = %S"
279 "Assertion failed: %S") 283 "Assertion failed: %S")
280 (quote ,assertion) ,failing-case) 284 (quote ,(or description assertion)) ,failing-case)
281 (incf assertion-failures)) 285 (incf assertion-failures))
282 (t (Print-Failure (if ,failing-case 286 (t (Print-Failure (if ,failing-case
283 "%S ==> error: %S; failing case = %S" 287 "%S ==> error: %S; failing case = %S"
284 "%S ==> error: %S") 288 "%S ==> error: %S")
285 (quote ,assertion) error-info ,failing-case) 289 (quote ,(or description assertion))
290 error-info ,failing-case)
286 (incf other-failures) 291 (incf other-failures)
287 ))) 292 )))
288 293
289 294
290 (defmacro Check-Error (expected-error &rest body) 295 (defmacro Check-Error (expected-error &rest body)