[elpa] externals/hyperbole d977223650 6/7: Fix hsys-org tag handling test

[ELPA Syncer]

branch: externals/hyperbole
commit d97722365083e4f86d76111376ed7b80f53f1be2
Author: bw <rsw@gnu.org>
Commit: bw <rsw@gnu.org>

    Fix hsys-org tag handling test
---
 ChangeLog              | 11 +++++++++--
 hibtypes.el            |  4 +++-
 test/hsys-org-tests.el | 10 +++++-----
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 74c232414e..2b983bcc38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-07-31  Bob Weiner  <rsw@gnu.org>
+
+* hibtypes.el (org-uuid-regexp): Add variable def for when missing in certain 
earlier Org
+    versions.
+
+* test/hsys-org-tests.el (hsys-org---agenda-tags-string): Fix to current tag 
handling code.
+
 2024-07-28  Bob Weiner  <rsw@gnu.org>
 
 * hproperty.el (hproperty:but-add): Add a button only when a button with the 
same property
@@ -130,8 +137,8 @@
 
 2024-07-06  Bob Weiner  <rsw@gnu.org>
 
-* hibtypes.el (org-id): Fix bug in older versions of Org where where
-    'org-uuid-regexp' was not bound.
+* hibtypes.el (org-id): Fix bug in older versions of Org where 
'org-uuid-regexp'
+    was not bound.
 
 * hbut.el (ibut:create): Improved when err occurs in type to print the err 
before
     triggering a backtrace when in batch mode.
diff --git a/hibtypes.el b/hibtypes.el
index 1d12df73cc..78742fa0da 100644
--- a/hibtypes.el
+++ b/hibtypes.el
@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    19-Sep-91 at 20:45:31
-;; Last-Mod:     14-Jul-24 at 12:11:19 by Bob Weiner
+;; Last-Mod:     31-Jul-24 at 01:31:32 by Bob Weiner
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -67,6 +67,8 @@
 
 (defvar cscope-output-line-regexp)
 
+(defvar org-uuid-regexp)
+
 (declare-function actype:eval "hact")
 (declare-function actype:identity "hact")
 (declare-function hact "hact")
diff --git a/test/hsys-org-tests.el b/test/hsys-org-tests.el
index 62c647267c..ff4b70864b 100644
--- a/test/hsys-org-tests.el
+++ b/test/hsys-org-tests.el
@@ -3,7 +3,7 @@
 ;; Author:       Mats Lidell <matsl@gnu.org>
 ;;
 ;; Orig-Date:    23-Apr-21 at 20:55:00
-;; Last-Mod:     28-Jul-24 at 11:44:20 by Mats Lidell
+;; Last-Mod:     31-Jul-24 at 01:46:48 by Bob Weiner
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -205,18 +205,18 @@ This is independent of the setting of 
`hsys-org-enable-smart-keys'."
     (font-lock-ensure)
 
     (should (and (search-forward "header ") (looking-at-p ":tag1:")))
-    (should (string= ":tag1:tag2:tag3" (hsys-org--agenda-tags-string)))
+    (should (string= ":tag1:tag2:tag3:" (hsys-org--agenda-tags-string)))
 
     (forward-char)
     (should (looking-at-p "tag1:"))
-    (should (string= ":tag1" (hsys-org--agenda-tags-string)))
+    (should (string= "tag1" (hsys-org--agenda-tags-string)))
 
     (should (and (search-forward "tag1") (looking-at-p ":tag2:")))
-    (should (string= ":tag1:tag2:tag3" (hsys-org--agenda-tags-string)))
+    (should (string= ":tag1:tag2:tag3:" (hsys-org--agenda-tags-string)))
 
     (forward-char)
     (should (looking-at-p "tag2:"))
-    (should (string= ":tag2" (hsys-org--agenda-tags-string)))))
+    (should (string= "tag2" (hsys-org--agenda-tags-string)))))
 
 (ert-deftest hsys-org--get-agenda-tags ()
   "Verify `hsys-org-get-agenda-tags' calls org-consult-agenda-function."