From: Jan Nieuwenhuizen <janneke@gnu.org>
To: guile-devel <guile-devel@gnu.org>
Subject: [PATCH] Add GNU-style error location for failing tests in test-suite.
Date: Tue, 23 Sep 2014 18:41:42 +0200 [thread overview]
Message-ID: <87wq8uffw9.fsf@drakenvlieg.flower> (raw)
[-- Attachment #1: Type: text/plain, Size: 205 bytes --]
Hi,
I am using the test-suite for my project and found that doing TDD it is
very helpful if Emacs jumps automatically to the failing tests'
location.
Patch attached. What do you think?
Greetings, Jan
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Add-GNU-style-error-location-for-failing-tests-in-te.patch --]
[-- Type: text/x-diff, Size: 7168 bytes --]
From efce4fa4be1c9bc6e368193b82b7eaa9b9957fee Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 23 Sep 2014 18:37:44 +0200
Subject: [PATCH] Add GNU-style error location for failing tests in test-suite.
2014-09-23 Jan Nieuwenhuizen <janneke@gnu.org>
* test-suite/test-suite/lib.scm (run-test): Add location parameter;
display GNU style error location for failing test.
* test-suite/test-suite/lib.scm (pass-if, pass-if-equal)
(run-test-exception, pass-if-exception, expect-fail-exception):
Update callers.
---
test-suite/test-suite/lib.scm | 45 +++++++++++++++++++++++--------------------
1 file changed, 24 insertions(+), 21 deletions(-)
diff --git a/test-suite/test-suite/lib.scm b/test-suite/test-suite/lib.scm
index 9ecaf89..7bd3260 100644
--- a/test-suite/test-suite/lib.scm
+++ b/test-suite/test-suite/lib.scm
@@ -77,16 +77,16 @@
\f
;;;; CORE FUNCTIONS
;;;;
-;;;; The function (run-test name expected-result thunk) is the heart of the
+;;;; The function (run-test name location expected-result thunk) is the heart of the
;;;; testing environment. The first parameter NAME is a unique name for the
;;;; test to be executed (for an explanation of this parameter see below under
-;;;; TEST NAMES). The second parameter EXPECTED-RESULT is a boolean value
+;;;; TEST NAMES). The third parameter EXPECTED-RESULT is a boolean value
;;;; that indicates whether the corresponding test is expected to pass. If
;;;; EXPECTED-RESULT is #t the test is expected to pass, if EXPECTED-RESULT is
;;;; #f the test is expected to fail. Finally, THUNK is the function that
;;;; actually performs the test. For example:
;;;;
-;;;; (run-test "integer addition" #t (lambda () (= 2 (+ 1 1))))
+;;;; (run-test "integer addition" (current-source-location) #t (lambda () (= 2 (+ 1 1))))
;;;;
;;;; To report success, THUNK should either return #t or throw 'pass. To
;;;; report failure, THUNK should either return #f or throw 'fail. If THUNK
@@ -104,9 +104,9 @@
;;;; Convenience macros for tests expected to pass or fail
;;;;
;;;; * (pass-if name body) is a short form for
-;;;; (run-test name #t (lambda () body))
+;;;; (run-test name (current-source-location) #t (lambda () body))
;;;; * (expect-fail name body) is a short form for
-;;;; (run-test name #f (lambda () body))
+;;;; (run-test name (current-source-location) #f (lambda () body))
;;;;
;;;; For example:
;;;;
@@ -159,9 +159,9 @@
;;;; a test name in such cases.
;;;;
;;;; * (pass-if expression) is a short form for
-;;;; (run-test 'expression #t (lambda () expression))
+;;;; (run-test 'expression location #t (lambda () expression))
;;;; * (expect-fail expression) is a short form for
-;;;; (run-test 'expression #f (lambda () expression))
+;;;; (run-test 'expression location #f (lambda () expression))
;;;;
;;;; For example:
;;;;
@@ -317,7 +317,7 @@
;;; The idea is taken from Greg, the GNUstep regression test environment.
(define run-test
(let ((test-running #f))
- (lambda (name expect-pass thunk)
+ (lambda (name location expect-pass thunk)
(if test-running
(error "Nested calls to run-test are not permitted."))
(let ((test-name (full-name name)))
@@ -331,20 +331,21 @@
(lambda (key . args)
(case key
((pass)
- (report (if expect-pass 'pass 'upass) test-name))
+ (report (if expect-pass 'pass 'upass) test-name location))
((fail)
;; ARGS may contain extra info about the failure,
;; such as the expected and actual value.
(apply report (if expect-pass 'fail 'xfail)
test-name
+ location
args))
((unresolved untested unsupported)
- (report key test-name))
+ (report key test-name location))
((quit)
- (report 'unresolved test-name)
+ (report 'unresolved test-name location)
(quit))
(else
- (report 'error test-name (cons key args))))))
+ (report 'error test-name location (cons key args))))))
(set! test-running #f)))))
;;; A short form for tests that are expected to pass, taken from Greg.
@@ -353,9 +354,9 @@
((_ name)
;; presume this is a simple test, i.e. (pass-if (even? 2))
;; where the body should also be the name.
- (run-test 'name #t (lambda () name)))
+ (run-test 'name (current-source-location) #t (lambda () name)))
((_ name rest ...)
- (run-test name #t (lambda () rest ...)))))
+ (run-test name (current-source-location) #t (lambda () rest ...)))))
(define-syntax pass-if-equal
(syntax-rules ()
@@ -363,7 +364,7 @@
((_ expected body)
(pass-if-equal 'body expected body))
((_ name expected body ...)
- (run-test name #t
+ (run-test name (current-source-location) #t
(lambda ()
(let ((result (begin body ...)))
(or (equal? expected result)
@@ -377,12 +378,12 @@
((_ name)
;; presume this is a simple test, i.e. (expect-fail (even? 2))
;; where the body should also be the name.
- (run-test 'name #f (lambda () name)))
+ (run-test 'name (current-source-location) #f (lambda () name)))
((_ name rest ...)
- (run-test name #f (lambda () rest ...)))))
+ (run-test name (current-source-location) #f (lambda () rest ...)))))
;;; A helper function to implement the macros that test for exceptions.
-(define (run-test-exception name exception expect-pass thunk)
+(define (run-test-exception name location exception expect-pass thunk)
(match exception
((expected-key . expected-pattern)
(run-test
@@ -408,13 +409,13 @@
(define-syntax pass-if-exception
(syntax-rules ()
((_ name exception body rest ...)
- (run-test-exception name exception #t (lambda () body rest ...)))))
+ (run-test-exception name (current-source-location) exception #t (lambda () body rest ...)))))
;;; A short form for tests expected to fail to throw a certain exception.
(define-syntax expect-fail-exception
(syntax-rules ()
((_ name exception body rest ...)
- (run-test-exception name exception #f (lambda () body rest ...)))))
+ (run-test-exception name (current-source-location) exception #f (lambda () body rest ...)))))
\f
;;;; TEST NAMES
@@ -620,11 +621,13 @@
'(fail upass unresolved error))
;;; Display a single test result in formatted form to the given port
-(define (print-result port result name . args)
+(define (print-result port result name location . args)
(let* ((tag (assq result result-tags))
(label (if tag (cadr tag) #f)))
(if label
(begin
+ (if (not (eq? result 'pass))
+ (format port "~a:~a:" (assoc-ref location 'filename) (1+ (assoc-ref location 'line))))
(display label port)
(display ": " port)
(display (format-test-name name) port)
--
/home/janneke/.signature
[-- Attachment #3: Type: text/plain, Size: 151 bytes --]
--
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.nl
next reply other threads:[~2014-09-23 16:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-23 16:41 Jan Nieuwenhuizen [this message]
2014-10-05 9:33 ` [PATCH] Add GNU-style error location for failing tests in test-suite. v2 Jan Nieuwenhuizen
2014-10-05 21:40 ` [PATCH] Add GNU-style error location for failing tests in test-suite. v3 Jan Nieuwenhuizen
2014-10-29 21:40 ` Mark H Weaver
2014-12-07 8:41 ` Jan Nieuwenhuizen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/guile/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87wq8uffw9.fsf@drakenvlieg.flower \
--to=janneke@gnu.org \
--cc=guile-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).