branch: externals/hyperbole
commit 65f92705e6baa16f96e5e9da889812332e1b65c9
Merge: 28f1906956 31f820d1ce
Author: Robert Weiner <[email protected]>
Commit: GitHub <[email protected]>
Merge pull request #873 from
rswgnu/pr_fix_testcase_failing_in_batch_or_interactive
Adjust test case that fails in either batch or interactive
---
ChangeLog | 9 +++++++++
test/hywiki-yki-tests.el | 16 ++++------------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index cbebf39c39..eb765289f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2026-02-27 Mats Lidell <[email protected]>
+
+* test/hywiki-yki-tests.el (hywiki-test--insert-with-point): Remove. Reuse
+ similar function from hywiki-tests.el instead.
+ (hywiki-test--get-buffer-text-with-point-and-highlight): Change to a
+ more lifelike test that behaves the same in batch as interactively to
+ solve the issue with the failing test for now. Use
+ hywiki-tests--insert-by-char and remove not needed hywiki-mode calls.
+
2026-02-26 Bob Weiner <[email protected]>
* hywiki.el (hywiki-word-strip-suffix): Fix to strip any leading or trailing #
diff --git a/test/hywiki-yki-tests.el b/test/hywiki-yki-tests.el
index 07b54254ae..e45e14eb01 100644
--- a/test/hywiki-yki-tests.el
+++ b/test/hywiki-yki-tests.el
@@ -105,12 +105,6 @@ inserted. Finally a `hywiki-test--point-char' is inserted
where point is."
(should (string= (hywiki-test--insert-chars '((1 . 6) (7 . 12)))
"<Hell^o> <World>\n"))))
-(defun hywiki-test--insert (string)
- "Command to insert a STRING at point."
- (interactive "s: ")
- (dolist (c (string-to-list string))
- (hywiki-tests--command-execute #'self-insert-command 1 c)))
-
(defun hywiki-test--insert-with-point (string)
"Insert STRING and return new POINT pos given by `hywiki-test--point-char'.
The point char is not inserted."
@@ -132,7 +126,6 @@ buffer.
End the insertion of text by turning on hywiki-mode and perform a dummy
command to get the pre- and post-hooks executed. This creates the
highlighting overlays we want to test."
- (hywiki-mode :all)
(erase-buffer)
(goto-char (hywiki-test--insert-with-point description)))
@@ -173,7 +166,6 @@ Each test is constructed as three phases:
(should (string= stop
(hywiki-test--get-buffer-text-with-point-and-highlight)))))
(unwind-protect
(progn
- (hywiki-mode :all)
(ert-info ("1" :prefix "Verify point, no highlighting:")
(pre: "non^wikiword")
(post: "non^wikiword"))
@@ -186,12 +178,12 @@ Each test is constructed as three phases:
(post: "^<Hi>"))
(ert-info ("4" :prefix "Verify highlighting: ")
(pre: "Hi^Ho")
- (hywiki-test--insert "\"text\"")
- (post: "Hi\"text\"^<Ho>"))
+ (hywiki-tests--insert-by-char "text ")
+ (post: "Hitext ^<Ho>"))
(ert-info ("5" :prefix "Verify highlighting: ")
(pre: "Hi^Ho")
- (hywiki-test--insert " \"text\"")
- (post: "<Hi> \"text\"^<Ho>"))
+ (hywiki-tests--insert-by-char " text ")
+ (post: "<Hi> text ^<Ho>"))
;; PASS: Wiki<delete-region>Word -> highlight {WikiWord} after
delete
(ert-info ("6" :prefix "Verify highlighting: ")
