Rebased on rsw and further improvements

Author: matsl

ChangeLog

@@ -1,21 +1,22 @@
-2026-02-01  Mats Lidell  <matsl@gnu.org>
+2026-02-02  Mats Lidell  <matsl@gnu.org>
 
 * test/hywiki-tests.el (hywiki-tests--word-at): Require wikiword to
     exist. Use the wikiword range for verifying the highlighting. Avoids
     differences in how wikiwords are found and lets hywiki-word-at decide.
-    (hywiki-tests--run-test-case): Do not erase-buffer. Some test cases
-    depend on preparing the buffer before this is called. Use ert-info for
-    better feedback when failing.
-    (hywiki-tests--wikiword-step-check-verification)
-    (hywiki-tests--wikiword-step-check-verification-with-surrounding-text):
-    Create wikipages, required by hywkii-tests--word-at.
-    (hywiki-tests--wikiword-step-check-verification-with-faces)
-    (hywiki-tests--face-property-for-wikiword-with-wikipage)
-    (hywiki-tests--no-face-property-for-no-wikipage)
-    (hywiki-tests--verify-face-property-when-editing-wikiword)
-    (hywiki-tests--verify-face-property-when-editing-wikiword-first-char)
-    (hywiki-tests--references-to-org-link, hywiki-tests--word-face-at-p): : Drop
-    interactive requirement.
+    (hywiki-tests--word-face-at-p): Drop interactive requirement.
+    (hywiki-tests--run-test-case): Don't adjust newpos to buffer
+    limits. It is set by the test specification.
+    (hywiki-tests--maybe-highlight-page-names): Erase buffer between tests
+    and enable test as expected success.
+    (hywiki-tests--verify-removal-of-delimiter-updates-face): Adjust test
+    case and remove expected failed.
+    (hywiki-tests--publish-special-cases): Remove error comments and
+    enable old failing test.
+    (hywiki-tests--wikiword-identified-in-emacs-lisp-mode): Mark as
+    expected failed. There are problems with how the WikiWords are
+    identified that causes the test to fail.
+
+2026-02-01  Mats Lidell  <matsl@gnu.org>
 
 * test/hywiki-tests.el (hywiki-tests--publish-special-cases): Avoid revert query.
                        (hywiki-tests--save-referent-find-use-menu): Use

test/hywiki-tests.el

@@ -3,7 +3,7 @@
 ;; Author:       Mats Lidell
 ;;
 ;; Orig-Date:    18-May-24 at 23:59:48
-;; Last-Mod:      2-Feb-26 at 00:32:30 by Bob Weiner
+;; Last-Mod:      2-Feb-26 at 10:36:00 by Mats Lidell
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -1114,15 +1114,10 @@ WikiWord#Csection-subsection
 
             (dolist (v `(("WikiWord WikiWord" . ,(format "%s %s" href href))
 			 ("\"WikiWord WikiWord\"" . ,(format "\"%s %s\"" href href))
-			 ;;                                       ^ Missing a space!?
 			 ("WikiWord Text WikiWord" . ,(format "%s Text %s" href href))
 			 ("\"WikiWord Text WikiWord\"" . ,(format "\"%s Text %s\"" href href))
-			 ;;                                            ^ Missing " Text "
 			 ("WikiWord WikiWord WikiWord" . ,(format "%s %s %s" href href href))
-			 ;; !! TODO FIXME
-			 ;; (cons "\"WikiWord WikiWord WikiWord\"" (format "\"%s %s %s\"" href href href))
-			 ;; ^ Crashes due to (wrong-type-argument integer-or-marker-p nil) caused by buffer-substring-no-properties(nil nil)
-			 ))
+			 ("\"WikiWord WikiWord WikiWord\"" . ,(format "\"%s %s %s\"" href href href))))
               (let ((input (car v))
                     (regex-output (cdr v))
                     (revert-without-query '(".*")))
@@ -1642,11 +1637,11 @@ comparison with expected overlays stable."
   "Choose what test to perform based on value of `hywiki-tests--with-face-test'."
   (let* ((range (hywiki-word-at :range)))
     (when (hywiki-get-referent (car range))
-      (if (and range hywiki-tests--with-face-test)
-          (save-excursion
-            (goto-char (cadr range))
-            (hywiki-highlighted-word-at))
-        (car range)))))
+      (when (and range hywiki-tests--with-face-test)
+        (save-excursion
+          (goto-char (round (/ (+ (cadr range) (caddr range)) 2.0)))
+          (should (equal range (hywiki-highlighted-word-at :range)))))
+      (car range))))
 
 (defun hywiki-tests--verify-hywiki-word (expected)
   "Verify that `hywiki-word-at' returns t if a wikiword is EXPECTED.
@@ -1831,6 +1826,7 @@ face is verified during the change."
 
 (ert-deftest hywiki-tests--wikiword-identified-in-emacs-lisp-mode ()
   "Verify WikiWord is identified when surrounded by delimiters in `emacs-lisp-mode'."
+  :expected-result :failed
   (hywiki-tests--preserve-hywiki-mode
     (emacs-lisp-mode)
     (let* ((hsys-org-enable-smart-keys t)
@@ -1925,15 +1921,15 @@ face is verified during the change."
 
 (ert-deftest hywiki-tests--verify-removal-of-delimiter-updates-face ()
   "Verify WikiWord highlight face change when adding/removing a delimiter."
-  :expected-result :failed
   (hywiki-tests--preserve-hywiki-mode
-    (let ((hywiki-tests--with-face-test t))
-      (setq wiki-page (cdr (hywiki-add-page "Hi")))
-      (dolist (testcase
-               '((("\"Hi#a b c\"") (p3 . "Hi#a b c") (p11) (-1) (p3 . "Hi#a") (p10) ("\"") (p3 . "Hi#a b c"))
-                 (("(Hi#s n)" . "Hi#s n") (-1) (p3 . "Hi#s") (p8) (")" . "Hi#s n"))))
-	(erase-buffer)
-        (hywiki-tests--run-test-case testcase)))))
+    (let ((page (cdr (hywiki-add-page "Hi"))))
+      (unwind-protect
+          (dolist (testcase
+                   '((("\"Hi#a b c\"" . t) (p3 . "Hi#a b c") (p11) (-1) (p3 . "Hi#a") (p10) ("\"" . "Hi#a b c"))
+                     (("(Hi#s n)" . "Hi#s n") (-1) (p3 . "Hi#s") (p8) (")" . "Hi#s n"))))
+            (erase-buffer)
+            (hywiki-tests--run-test-case testcase))
+        (hy-delete-file-and-buffer page)))))
 
 (ert-deftest hywiki-tests--wikiword-yanked-with-extra-words ()
   "Verify that a yanked in WikiWord highlights properly."
@@ -2010,7 +2006,6 @@ face is verified during the change."
 Start and stop point of all highlighted regions in the buffer, as
 computed by `hywiki-tests--hywiki-face-regions', are compared to the
 expected result."
-  :expected-result :failed
   (hywiki-tests--preserve-hywiki-mode
     (let* ((wikiword (cdr (hywiki-add-page "WiWo")))
 	   input
@@ -2022,12 +2017,12 @@ expected result."
                        ("WiWo text WiWo" . ((1 . 5) (11 . 15)))
                        ("\"WiWo\"" . ((2 . 6)))
                        ("\"WiWo text\"" . ((2 . 6)))
-                       ;; Failing tests below.
                        ("\"WiWo WiWo\"" . ((2 . 6) (7 . 11)))
                        ("\"WiWo text WiWo\"" . ((2 . 6) (12 . 16)))
                        ("\"WiWo WiWo WiWo\"" . ((2 . 6) (7 . 11) (12 . 16)))))
             (setq input (car v)
                   overlay-regions (cdr v))
+            (erase-buffer)
             (hywiki-tests--insert input)
 	    (hywiki-maybe-highlight-references (point-min) (point-max))
 	    ;; Verify Overlays