branch: elpa/d-mode
commit 7817dbc040da57289901f82250324cd5a083a050
Author: Vladimir Panteleev <[email protected]>
Commit: Vladimir Panteleev <[email protected]>
d-mode-test: Announce mismatched values of inline tests
---
d-mode-test.el | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/d-mode-test.el b/d-mode-test.el
index 1347254..d61a759 100644
--- a/d-mode-test.el
+++ b/d-mode-test.el
@@ -178,7 +178,7 @@
(testbuf (make-test-buffer filename))
(pop-up-windows t)
(linenum 1)
- error-found-p
+ error-found
expectedindent
c-echo-syntactic-information-p)
@@ -190,25 +190,25 @@
(match-string 1 contents)))
(out-str (if (string-match "^// #out: \\(.+\\)$" contents)
(match-string 1 contents))))
- (if run-str
- (let ((result (eval (car (read-from-string run-str)))))
- (when out-str
- (let ((expect (car (read-from-string out-str))))
- (if (not (equal result expect))
- (setq error-found-p t)))))))
-
- (when error-found-p
+ (when run-str
+ (let ((result (eval (car (read-from-string run-str)))))
+ (when out-str
+ (let ((expect (car (read-from-string out-str))))
+ (unless (equal result expect)
+ (setq error-found (format "\nExpected: %s\nGot : %s" expect
result))))))))
+
+ (when error-found
(set-buffer testbuf)
(buffer-enable-undo testbuf)
(set-buffer-modified-p nil)
- (error "Regression found in file %s" filename))
+ (error "Regression found in file %s: %s" filename error-found))
(set-buffer save-buf)
(goto-char save-point)
- (when (and (not error-found-p) (interactive-p))
+ (when (and (not error-found) (interactive-p))
(kill-test-buffer))
- (not error-found-p)))
+ (not error-found)))
;; Run the tests
(ert-deftest d-mode-basic ()
