Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-05-18 21:29:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #998 from dpk/test-error-predicate

Browse source 
(chibi test): add a type test for exceptions in test-error
This commit is contained in:
Alex Shinn 2024-08-28 10:30:30 +09:00 • committed by GitHub
commit 491cf324ec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
lib/chibi/test.scm
View file

@ -144,10 +144,11 @@
(test name (call-with-values (lambda () expect) (lambda results results)) (test name (call-with-values (lambda () expect) (lambda results results))
(call-with-values (lambda () expr) (lambda results results)))))) (call-with-values (lambda () expr) (lambda results results))))))
;;> \macro{(test-error [name] expr)} ;;> \macro{(test-error [name [pred]] expr)}
;;> Like \scheme{test} but evaluates \var{expr} and checks that it ;;> Like \scheme{test} but evaluates \var{expr} and checks that it
;;> raises an error. ;;> raises an error. If \var{pred} is provided, the raised error
;;> object must additionally satisfy the given type test.
(define-syntax test-error (define-syntax test-error
(syntax-rules () (syntax-rules ()
@ -155,8 +156,12 @@
(test-error #f expr)) (test-error #f expr))
((_ name expr) ((_ name expr)
(test-propagate-info name #f expr ((expect-error . #t)))) (test-propagate-info name #f expr ((expect-error . #t))))
((_ name pred expr)
(test-propagate-info name #f expr ((expect-error . #t)
(error-type-test . ,pred)
(error-type-test-expr . pred))))
((test a ...) ((test a ...)
(test-syntax-error 'test-error "1 or 2 arguments required" (test-syntax-error 'test-error "1, 2, or 3 arguments required"
(test a ...))))) (test a ...)))))
;;> Low-level macro to pass alist info to the underlying \var{test-run}. ;;> Low-level macro to pass alist info to the underlying \var{test-run}.
@ -535,6 +540,12 @@
(expect)))) (expect))))
(guard (guard
(exn (exn
((and (assq-ref info 'expect-error)
(assq-ref info 'error-type-test))
=> (lambda (pred)
((current-test-reporter)
(if (pred exn) 'PASS 'FAIL)
(append `((exception . ,exn)) info))))
(else (else
((current-test-reporter) ((current-test-reporter)
(if (assq-ref info 'expect-error) 'PASS 'ERROR) (if (assq-ref info 'expect-error) 'PASS 'ERROR)
@ -595,8 +606,15 @@
(display "assertion failed")) (display "assertion failed"))
((and (eq? status 'FAIL) (assq-ref info 'expect-error)) ((and (eq? status 'FAIL) (assq-ref info 'expect-error))
(display indent) (display indent)
(display "expected an error but got ") (if (assq-ref info 'exception)
(write (assq-ref info 'result))) (begin
(display "error should satisfy ")
(write (assq-ref info 'error-type-test-expr))
(display " but raised ")
(write (assq-ref info 'exception)))
(begin
(display "expected an error but got ")
(write (assq-ref info 'result)))))
((eq? status 'FAIL) ((eq? status 'FAIL)
(display indent) (display indent)
(display-expected/actual (display-expected/actual