branch: externals/hyperbole
commit da21ebb5f15e3dc5dae86a2d7e089b149e87a46b
Author: Bob Weiner <[email protected]>
Commit: Bob Weiner <[email protected]>
hypb-ert-* - Disable ert's messages in favor of those from each test
---
ChangeLog | 5 +++++
hbut.el | 6 +++---
hypb-ert.el | 15 ++++++++++-----
3 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a230e0e6e0..6a24c25365 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-07-09 Bob Weiner <[email protected]>
+
+* hypb-ert.el (hypb-ert-*): Change all calls of 'ert' to disable ert's messages
+ so that any test's message is displayed after an hypb-ert test case run.
+
2023-07-08 Bob Weiner <[email protected]>
* test/demo-tests.el
(demo-implicit-button-action-button-boolean-function-call-test):
diff --git a/hbut.el b/hbut.el
index 10606694ec..f43a7ff13e 100644
--- a/hbut.el
+++ b/hbut.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 18-Sep-91 at 02:57:09
-;; Last-Mod: 8-Jul-23 at 16:02:16 by Bob Weiner
+;; Last-Mod: 8-Jul-23 at 16:58:20 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -2188,8 +2188,8 @@ Summary of operations based on inputs (name arg comes
from \\='hbut:current attr
| # | name | new-name | region | edit | operation
|
|----+------+----------+--------+------+-----------------------------------------------|
| 1 | nil | nil | nil | nil | create: unnamed ibut from
hbut:current attrs |
-| 2 | nil | new-name | nil | nil | create: new-name named ibut
|
-| 3 | name | nil | nil | nil | create: aname named ibut
|
+| 2 | nil | new-name | nil | nil | ERROR: create can't rename without
edit flag |
+| 3 | name | nil | nil | nil | create: ibut with name
|
| 4 | name | new-name | nil | nil | ERROR: create can't have name and
new-name |
| 5 | name | new-name | region | nil | ERROR: create can't have name and
new-name |
| 6 | name | nil | region | nil | create: aname named ibut (skip
region) |
diff --git a/hypb-ert.el b/hypb-ert.el
index 3eccbff8fe..d3c0fb58a4 100644
--- a/hypb-ert.el
+++ b/hypb-ert.el
@@ -3,7 +3,7 @@
;; Author: Mats Lidell <[email protected]> and Bob Weiner <[email protected]>
;;
;; Orig-Date: 31-Mar-21 at 21:11:00
-;; Last-Mod: 25-Jun-23 at 23:20:29 by Bob Weiner
+;; Last-Mod: 8-Jul-23 at 22:22:22 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -36,13 +36,13 @@
(hypb-ert-require-libraries)
(let ((test-sym (intern-soft test-name)))
(if test-sym
- (ert test-sym)
+ (ert test-sym nil #'hypb-ert-message-function)
(user-error "Invalid test name: %s" test-name))))
(defun hypb-ert-run-tests (test-selector)
"Run the specified TEST-SELECTOR defined ert test."
(hypb-ert-require-libraries)
- (ert (regexp-quote test-selector)))
+ (ert (regexp-quote test-selector) nil #'hypb-ert-message-function))
(defun hypb-ert-get-require-symbols ()
"Return the list of test Lisp library symbols to require."
@@ -60,7 +60,7 @@
"Run every ert test."
(interactive)
(hypb-ert-require-libraries)
- (ert t))
+ (ert t nil #'hypb-ert-message-function))
;; The following expression is true only when an ert-deftest has been
;; instrumented by edebug:
@@ -94,7 +94,7 @@ test when it is run."
(when (and test-sym (ert-test-boundp test-sym))
(when (and buffer-file-name (string-prefix-p hyperb:dir
buffer-file-name))
(hypb-ert-require-libraries))
- (ert test-sym))))
+ (ert test-sym nil #'hypb-ert-message-function))))
(defib hyperbole-run-test-definition ()
"If on the name in the first line of an ert test def, eval and run the test.
@@ -109,5 +109,10 @@ With an Assist Key press instead, edebug the test and step
through it."
(when test-name
(hypb-ert-run-test-at-definition test-name t))))
+(defun hypb-ert-message-function (_msg-pat &rest _args)
+ "Ignore messages ert outputs so can display messages from tests run."
+ ;; (identity (apply #'format msg-pat args)))))))
+ nil)
+
(provide 'hypb-ert)
;;; hypb-ert.el ends here
