From feadcae139fbf34add3f957bde4aa44da529cb6f Mon Sep 17 00:00:00 2001
From: Dmitry Gutov <dgutov@yandex.ru>
Date: Mon, 13 Sep 2021 15:47:45 +0300
Subject: [PATCH] Fix the tests

* test/lisp/progmodes/xref-tests.el
(xref--xref-file-name-display-is-abs)
(xref--xref-file-name-display-is-nondirectory)
(xref--xref-file-name-display-is-relative-to-project-root):
Update for the latest change in xref.el.
---
 test/lisp/progmodes/xref-tests.el | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/test/lisp/progmodes/xref-tests.el b/test/lisp/progmodes/xref-tests.el
index ff4b647ae0f..b1de1a4df5a 100644
--- a/test/lisp/progmodes/xref-tests.el
+++ b/test/lisp/progmodes/xref-tests.el
@@ -128,8 +128,12 @@
   (let ((xref-file-name-display 'abs))
     (should (equal
              (delete-dups
-              (mapcar 'xref-location-group
-                      (xref-tests--locations-in-data-dir "\\(bar\\|foo\\)")))
+              (mapcar
+               (lambda (loc)
+                 (xref--group-name-for-display
+                  (xref-location-group loc)
+                  nil))
+               (xref-tests--locations-in-data-dir "\\(bar\\|foo\\)")))
              (list
               (concat xref-tests--data-dir "file1.txt")
               (concat xref-tests--data-dir "file2.txt"))))))
@@ -137,8 +141,12 @@
 (ert-deftest xref--xref-file-name-display-is-nondirectory ()
   (let ((xref-file-name-display 'nondirectory))
     (should (equal (delete-dups
-                    (mapcar 'xref-location-group
-                            (xref-tests--locations-in-data-dir "\\(bar\\|foo\\)")))
+                    (mapcar
+                     (lambda (loc)
+                       (xref--group-name-for-display
+                        (xref-location-group loc)
+                        nil))
+                     (xref-tests--locations-in-data-dir "\\(bar\\|foo\\)")))
                    (list
                     "file1.txt"
                     "file2.txt")))))
@@ -146,13 +154,15 @@
 (ert-deftest xref--xref-file-name-display-is-relative-to-project-root ()
   (let* ((data-parent-dir
           (file-name-directory (directory-file-name xref-tests--data-dir)))
-         (project-find-functions
-          (lambda (_) (cons 'transient data-parent-dir)))
          (xref-file-name-display 'project-relative))
     (should (equal
              (delete-dups
-              (mapcar 'xref-location-group
-                      (xref-tests--locations-in-data-dir "\\(bar\\|foo\\)")))
+              (mapcar
+               (lambda (loc)
+                 (xref--group-name-for-display
+                  (xref-location-group loc)
+                  data-parent-dir))
+               (xref-tests--locations-in-data-dir "\\(bar\\|foo\\)")))
              (list
               "xref-resources/file1.txt"
               "xref-resources/file2.txt")))))
-- 
2.39.5