From 94c35159060698564a21a54cdb1d636472d1e8b2 Mon Sep 17 00:00:00 2001
From: Mats Lidell <mats.lidell@lidells.se>
Date: Fri, 24 Apr 2026 22:23:38 +0200
Subject: [PATCH] Add more hyrolo tests

* test/hyrolo-tests.el (hyrolo-tests--consult-fgrep)
(hyrolo-tests--consult-grep, hyrolo-tests--edit): Add tests.
---
 ChangeLog            |  5 +++
 test/hyrolo-tests.el | 81 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index a83327db..3bca95a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2026-05-03  Mats Lidell  <matsl@gnu.org>
+
+* test/hyrolo-tests.el (hyrolo-tests--consult-fgrep)
+    ((hyrolo-tests--consult-grep, hyrolo-tests--edit): Add tests.
+
 2026-04-30  Bob Weiner  <rsw@gnu.org>
 
 * kotl/kvspec.el (kvspec:update): If updating an existing viewspec, mark
diff --git a/test/hyrolo-tests.el b/test/hyrolo-tests.el
index ae0ff7b7..32ded338 100644
--- a/test/hyrolo-tests.el
+++ b/test/hyrolo-tests.el
@@ -19,10 +19,12 @@
 ;;; Code:
 
 (require 'ert)
+(require 'ert-x)
 (require 'hyrolo)
 (require 'hyrolo-demo)
 (require 'hy-test-dependencies) ;; can install el-mock
 (require 'hy-test-helpers "test/hy-test-helpers")
+(require 'rx)
 (require 'hib-kbd)
 (require 'kotl-mode)
 
@@ -1866,6 +1868,85 @@ match
             (hyrolo-display-matches buf1 buf2)
             (should (equal buf2 (current-buffer)))))))))
 
+(ert-deftest hyrolo-tests--consult-fgrep ()
+  "Verify `hyrolo-consult-grep' calls hsys-consult-grep."
+  (with-mock
+    (mock (hyrolo-consult-grep (regexp-quote "string") 0 nil nil))
+    (hyrolo-consult-fgrep "string" 0))
+  (with-mock
+    ;; Ignore checking grep-includes and ripgrep-globs
+    (mock (hsys-consult-grep * * "string" 1 (list "path-list") "Fgrep HyRolo files"))
+    (hyrolo-consult-fgrep "string" 1 (list "path-list"))))
+
+(ert-deftest hyrolo-tests--consult-grep ()
+  "Verify `hyrolo-consult-grep' calls hsys-consult-grep."
+  (defvar hyrolo-file-list)
+  (defvar path-list)
+  (let ((hyrolo-file-list '("hyrolo.otl" "another.otl"))
+        (path-list '("yet-another.otl")))
+    (with-mock
+      ;; Ignore checking grep-includes and ripgrep-globs
+      (mock (hsys-consult-grep * * nil nil hyrolo-file-list "Grep HyRolo files") => t)
+      (call-interactively #'hyrolo-consult-grep))
+    (with-mock
+      ;; Ignore checking grep-includes and ripgrep-globs
+      (mock (hsys-consult-grep * * "regexp" 0 path-list "Grep HyRolo headlines") => t)
+      (hyrolo-consult-grep "regexp" 0 path-list))))
+
+(ert-deftest hyrolo-tests--edit ()
+  "Verify `hyrolo-edit'."
+  (defvar hyrolo-file)
+  (let ((hyrolo-file (make-temp-file "hypb" nil ".otl" "===\nHdr\n===\n"))
+        (item-pat (rx "*" (= 3 space) "item")))
+    (unwind-protect
+        (let ((hyrolo-file-list (list hyrolo-file)))
+          (find-file (car (hyrolo-get-file-list)))
+          (hyrolo-add "alpha")
+          (hyrolo-add "item")
+          (hyrolo-add "xerxes")
+
+          (ert-info ("Edit item")
+            (goto-char (point-min))
+            (hyrolo-edit "item" hyrolo-file)
+            (should (looking-at-p item-pat)))
+
+          (ert-info ("Edit item called interactively")
+            (goto-char (point-min))
+            (with-mock
+              (mock (hsys-consult-grep-headlines-read-regexp #'hyrolo-consult-grep *) => "item")
+              (call-interactively #'hyrolo-edit))
+            (should (looking-at-p item-pat)))
+
+          (ert-info ("Edit item called interactively with consult active")
+            (goto-char (point-min))
+            (with-mock
+              (mock (hsys-consult-grep-headlines-read-regexp #'hyrolo-consult-grep *) =>
+                    (concat hyrolo-file ":10:item"))
+              (mock (hsys-consult-active-p) => t)
+              (call-interactively #'hyrolo-edit))
+            (should (looking-at-p item-pat)))
+
+          (ert-info ("Verify hook is called")
+            (let* (run-hook (hook (lambda () (setq run-hook t))))
+              (unwind-protect
+                  (progn
+                    (add-hook 'hyrolo-edit-hook hook)
+                    (hyrolo-edit "item" hyrolo-file)
+                    (should run-hook))
+                (remove-hook 'hyrolo-edit-hook hook))))
+
+          (ert-info ("Error cases")
+            (should-error (hyrolo-edit 'symbol))
+            (should-error (hyrolo-edit "" (make-temp-name "hypb")))
+            (should-not (hyrolo-edit nil))
+            (with-mock
+              (mock (beep) => t)
+              (ert-with-message-capture cap
+                (should-not (hyrolo-edit "beta" hyrolo-file))
+                (hy-test-helpers:should-last-message "not found" cap)))))
+
+      (hy-delete-file-and-buffer hyrolo-file))))
+
 (provide 'hyrolo-tests)
 
 ;; This file can't be byte-compiled without the `el-mock' package