mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
6f6639d6ed
Allow Dired to handle calls like \(dired \"~/foo/*/*.el\"), that is, with wildcards within the directory part of the file argument (Bug#27631). * lisp/files.el (insert-directory-wildcard-in-dir-p): New predicate. (insert-directory-clean): New defun extracted from insert-directory. (insert-directory) * lisp/dired.el (dired-internal-noselect) (dired-insert-directory): Use the new predicate; when it's true, handle the directory wildcards with a shell call. * lisp/eshell/em-ls.el (eshell-ls-use-in-dired): Add/remove both advices. (eshell-ls-unload-hook): New defun. Use it in eshell-ls-unload-hook instead of an anonymous function. (eshell-ls--dired) * lisp/ls-lisp.el (ls-lisp--dired): Advice dired to handle wildcards in the directory part with both eshell-ls and ls-lisp. * etc/NEWS: Announce it. * doc/emacs/dired.texi (Dired Enter): Update manual. * test/lisp/dired-tests.el (dired-test-bug27631): Add test.
319 lines
13 KiB
EmacsLisp
319 lines
13 KiB
EmacsLisp
;;; dired-tests.el --- Test suite. -*- lexical-binding: t -*-
|
|
|
|
;; Copyright (C) 2015-2017 Free Software Foundation, Inc.
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
;;; Code:
|
|
(require 'ert)
|
|
(require 'dired)
|
|
(require 'nadvice)
|
|
(require 'ls-lisp)
|
|
|
|
(ert-deftest dired-autoload ()
|
|
"Tests to see whether dired-x has been autoloaded"
|
|
(should
|
|
(fboundp 'dired-jump))
|
|
(should
|
|
(autoloadp
|
|
(symbol-function
|
|
'dired-jump))))
|
|
|
|
(ert-deftest dired-test-bug22694 ()
|
|
"Test for http://debbugs.gnu.org/22694 ."
|
|
(let* ((dir (expand-file-name "bug22694" default-directory))
|
|
(file "test")
|
|
(full-name (expand-file-name file dir))
|
|
(regexp "bar")
|
|
(dired-always-read-filesystem t) buffers)
|
|
(if (file-exists-p dir)
|
|
(delete-directory dir 'recursive))
|
|
(make-directory dir)
|
|
(with-temp-file full-name (insert "foo"))
|
|
(push (find-file-noselect full-name) buffers)
|
|
(push (dired dir) buffers)
|
|
(with-temp-file full-name (insert "bar"))
|
|
(dired-mark-files-containing-regexp regexp)
|
|
(unwind-protect
|
|
(should (equal (dired-get-marked-files nil nil nil 'distinguish-1-mark)
|
|
`(t ,full-name)))
|
|
;; Clean up
|
|
(dolist (buf buffers)
|
|
(when (buffer-live-p buf) (kill-buffer buf)))
|
|
(delete-directory dir 'recursive))))
|
|
|
|
(ert-deftest dired-test-bug25609 ()
|
|
"Test for http://debbugs.gnu.org/25609 ."
|
|
(let* ((from (make-temp-file "foo" 'dir))
|
|
(to (make-temp-file "bar" 'dir))
|
|
(target (expand-file-name (file-name-nondirectory from) to))
|
|
(nested (expand-file-name (file-name-nondirectory from) target))
|
|
(dired-dwim-target t)
|
|
(dired-recursive-copies 'always) ; Don't prompt me.
|
|
buffers)
|
|
(advice-add 'dired-query ; Don't ask confirmation to overwrite a file.
|
|
:override
|
|
(lambda (_sym _prompt &rest _args) (setq dired-query t))
|
|
'((name . "advice-dired-query")))
|
|
(advice-add 'completing-read ; Just return init.
|
|
:override
|
|
(lambda (_prompt _coll &optional _pred _match init _hist _def _inherit _keymap)
|
|
init)
|
|
'((name . "advice-completing-read")))
|
|
(push (dired to) buffers)
|
|
(push (dired-other-window temporary-file-directory) buffers)
|
|
(dired-goto-file from)
|
|
(dired-do-copy)
|
|
(dired-do-copy); Again.
|
|
(unwind-protect
|
|
(progn
|
|
(should (file-exists-p target))
|
|
(should-not (file-exists-p nested)))
|
|
(dolist (buf buffers)
|
|
(when (buffer-live-p buf) (kill-buffer buf)))
|
|
(delete-directory from 'recursive)
|
|
(delete-directory to 'recursive)
|
|
(advice-remove 'dired-query "advice-dired-query")
|
|
(advice-remove 'completing-read "advice-completing-read"))))
|
|
|
|
;; (ert-deftest dired-test-bug27243 ()
|
|
;; "Test for http://debbugs.gnu.org/27243 ."
|
|
;; (let ((test-dir (make-temp-file "test-dir-" t))
|
|
;; (dired-auto-revert-buffer t) buffers)
|
|
;; (with-current-buffer (find-file-noselect test-dir)
|
|
;; (make-directory "test-subdir"))
|
|
;; (push (dired test-dir) buffers)
|
|
;; (unwind-protect
|
|
;; (let ((buf (current-buffer))
|
|
;; (pt1 (point))
|
|
;; (test-file (concat (file-name-as-directory "test-subdir")
|
|
;; "test-file")))
|
|
;; (write-region "Test" nil test-file nil 'silent nil 'excl)
|
|
;; ;; Sanity check: point should now be on the subdirectory.
|
|
;; (should (equal (dired-file-name-at-point)
|
|
;; (concat (file-name-as-directory test-dir)
|
|
;; (file-name-as-directory "test-subdir"))))
|
|
;; (push (dired-find-file) buffers)
|
|
;; (let ((pt2 (point))) ; Point is on test-file.
|
|
;; (switch-to-buffer buf)
|
|
;; ;; Sanity check: point should now be back on the subdirectory.
|
|
;; (should (eq (point) pt1))
|
|
;; ;; Case 1: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27243#5
|
|
;; (push (dired-find-file) buffers)
|
|
;; (should (eq (point) pt2))
|
|
;; ;; Case 2: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27243#28
|
|
;; (push (dired test-dir) buffers)
|
|
;; (should (eq (point) pt1))))
|
|
;; (dolist (buf buffers)
|
|
;; (when (buffer-live-p buf) (kill-buffer buf)))
|
|
;; (delete-directory test-dir t))))
|
|
|
|
(ert-deftest dired-test-bug27243-01 ()
|
|
"Test for https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27243#5 ."
|
|
(let ((test-dir (make-temp-file "test-dir-" t))
|
|
(dired-auto-revert-buffer t) buffers)
|
|
(with-current-buffer (find-file-noselect test-dir)
|
|
(make-directory "test-subdir"))
|
|
(push (dired test-dir) buffers)
|
|
(unwind-protect
|
|
(let ((buf (current-buffer))
|
|
(pt1 (point))
|
|
(test-file (concat (file-name-as-directory "test-subdir")
|
|
"test-file")))
|
|
(write-region "Test" nil test-file nil 'silent nil 'excl)
|
|
;; Sanity check: point should now be on the subdirectory.
|
|
(should (equal (dired-file-name-at-point)
|
|
(concat (file-name-as-directory test-dir)
|
|
(file-name-as-directory "test-subdir"))))
|
|
(push (dired-find-file) buffers)
|
|
(let ((pt2 (point))) ; Point is on test-file.
|
|
(switch-to-buffer buf)
|
|
;; Sanity check: point should now be back on the subdirectory.
|
|
(should (eq (point) pt1))
|
|
(push (dired-find-file) buffers)
|
|
(should (eq (point) pt2))))
|
|
(dolist (buf buffers)
|
|
(when (buffer-live-p buf) (kill-buffer buf)))
|
|
(delete-directory test-dir t))))
|
|
|
|
(ert-deftest dired-test-bug27243-02 ()
|
|
"Test for https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27243#28 ."
|
|
(let ((test-dir (make-temp-file "test-dir-" t))
|
|
(dired-auto-revert-buffer t) buffers)
|
|
(with-current-buffer (find-file-noselect test-dir)
|
|
(make-directory "test-subdir"))
|
|
(push (dired test-dir) buffers)
|
|
(unwind-protect
|
|
(let ((buf (current-buffer))
|
|
(pt1 (point))
|
|
(test-file (concat (file-name-as-directory "test-subdir")
|
|
"test-file")))
|
|
(write-region "Test" nil test-file nil 'silent nil 'excl)
|
|
;; Sanity check: point should now be on the subdirectory.
|
|
(should (equal (dired-file-name-at-point)
|
|
(concat (file-name-as-directory test-dir)
|
|
(file-name-as-directory "test-subdir"))))
|
|
(push (dired-find-file) buffers)
|
|
(let ((pt2 (point))) ; Point is on test-file.
|
|
(switch-to-buffer buf)
|
|
;; Sanity check: point should now be back on the subdirectory.
|
|
(should (eq (point) pt1))
|
|
(push (dired test-dir) buffers)
|
|
(should (eq (point) pt1))))
|
|
(dolist (buf buffers)
|
|
(when (buffer-live-p buf) (kill-buffer buf)))
|
|
(delete-directory test-dir t))))
|
|
|
|
(ert-deftest dired-test-bug27243-03 ()
|
|
"Test for https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27243#61 ."
|
|
(let ((test-dir (make-temp-file "test-dir-" t))
|
|
(dired-auto-revert-buffer t)
|
|
test-subdir1 test-subdir2 allbufs)
|
|
(unwind-protect
|
|
(progn
|
|
(with-current-buffer (find-file-noselect test-dir)
|
|
(push (current-buffer) allbufs)
|
|
(make-directory "test-subdir1")
|
|
(make-directory "test-subdir2")
|
|
(let ((test-file1 "test-file1")
|
|
(test-file2 "test-file2"))
|
|
(with-current-buffer (find-file-noselect "test-subdir1")
|
|
(push (current-buffer) allbufs)
|
|
(write-region "Test1" nil test-file1 nil 'silent nil 'excl))
|
|
(with-current-buffer (find-file-noselect "test-subdir2")
|
|
(push (current-buffer) allbufs)
|
|
(write-region "Test2" nil test-file2 nil 'silent nil 'excl))))
|
|
;; Call find-file with a wild card and test point in each file.
|
|
(let ((buffers (find-file (concat (file-name-as-directory test-dir)
|
|
"*")
|
|
t)))
|
|
(dolist (buf buffers)
|
|
(let ((pt (with-current-buffer buf (point))))
|
|
(switch-to-buffer (find-file-noselect test-dir))
|
|
(find-file (buffer-name buf))
|
|
(should (equal (point) pt))))
|
|
(append buffers allbufs)))
|
|
(dolist (buf allbufs)
|
|
(when (buffer-live-p buf) (kill-buffer buf)))
|
|
(delete-directory test-dir t))))
|
|
|
|
(ert-deftest dired-test-bug27693 ()
|
|
"Test for http://debbugs.gnu.org/27693 ."
|
|
(let ((dir (expand-file-name "lisp" source-directory))
|
|
(size "")
|
|
ls-lisp-use-insert-directory-program buf)
|
|
(unwind-protect
|
|
(progn
|
|
(setq buf (dired (list dir "simple.el" "subr.el"))
|
|
size (number-to-string
|
|
(file-attribute-size
|
|
(file-attributes (dired-get-filename)))))
|
|
(search-backward-regexp size nil t)
|
|
(should (looking-back "[[:space:]]" (1- (point)))))
|
|
(when (buffer-live-p buf) (kill-buffer buf)))))
|
|
|
|
(ert-deftest dired-test-bug7131 ()
|
|
"Test for http://debbugs.gnu.org/7131 ."
|
|
(let* ((dir (expand-file-name "lisp" source-directory))
|
|
(buf (dired dir)))
|
|
(unwind-protect
|
|
(progn
|
|
(setq buf (dired (list dir "simple.el")))
|
|
(dired-toggle-marks)
|
|
(should-not (cdr (dired-get-marked-files)))
|
|
(kill-buffer buf)
|
|
(setq buf (dired (list dir "simple.el"))
|
|
buf (dired dir))
|
|
(dired-toggle-marks)
|
|
(should (cdr (dired-get-marked-files))))
|
|
(when (buffer-live-p buf) (kill-buffer buf)))))
|
|
|
|
(ert-deftest dired-test-bug27762 ()
|
|
"Test for http://debbugs.gnu.org/27762 ."
|
|
:expected-result :failed
|
|
(let* ((dir source-directory)
|
|
(default-directory dir)
|
|
(files (mapcar (lambda (f) (concat "src/" f))
|
|
(directory-files
|
|
(expand-file-name "src") nil "\\.*\\.c\\'")))
|
|
ls-lisp-use-insert-directory-program buf)
|
|
(unwind-protect
|
|
(let ((file1 "src/cygw32.c")
|
|
(file2 "src/atimer.c"))
|
|
(setq buf (dired (nconc (list dir) files)))
|
|
(dired-goto-file (expand-file-name file2 default-directory))
|
|
(should-not (looking-at "^ -")) ; Must be 2 spaces not 3.
|
|
(setq files (cons file1 (delete file1 files)))
|
|
(kill-buffer buf)
|
|
(setq buf (dired (nconc (list dir) files)))
|
|
(should (looking-at "src"))
|
|
(next-line) ; File names must be aligned.
|
|
(should (looking-at "src")))
|
|
(when (buffer-live-p buf) (kill-buffer buf)))))
|
|
|
|
(ert-deftest dired-test-bug27817 ()
|
|
"Test for http://debbugs.gnu.org/27817 ."
|
|
(require 'em-ls)
|
|
(let ((orig eshell-ls-use-in-dired)
|
|
(dired-use-ls-dired 'unspecified)
|
|
buf insert-directory-program)
|
|
(unwind-protect
|
|
(progn
|
|
(customize-set-variable 'eshell-ls-use-in-dired t)
|
|
(should (setq buf (dired source-directory))))
|
|
(customize-set-variable 'eshell-ls-use-in-dired orig)
|
|
(and (buffer-live-p buf) (kill-buffer)))))
|
|
|
|
(ert-deftest dired-test-bug27631 ()
|
|
"Test for http://debbugs.gnu.org/27631 ."
|
|
(let* ((dir (make-temp-file "bug27631" 'dir))
|
|
(dir1 (expand-file-name "dir1" dir))
|
|
(dir2 (expand-file-name "dir2" dir))
|
|
(default-directory dir)
|
|
buf)
|
|
(unwind-protect
|
|
(progn
|
|
(make-directory dir1)
|
|
(make-directory dir2)
|
|
(with-temp-file (expand-file-name "a.txt" dir1))
|
|
(with-temp-file (expand-file-name "b.txt" dir2))
|
|
(setq buf (dired (expand-file-name "dir*/*.txt" dir)))
|
|
(dired-toggle-marks)
|
|
(should (cdr (dired-get-marked-files)))
|
|
;; Must work with ls-lisp ...
|
|
(require 'ls-lisp)
|
|
(kill-buffer buf)
|
|
(setq default-directory dir)
|
|
(let (ls-lisp-use-insert-directory-program)
|
|
(setq buf (dired (expand-file-name "dir*/*.txt" dir)))
|
|
(dired-toggle-marks)
|
|
(should (cdr (dired-get-marked-files))))
|
|
;; ... And with em-ls as well.
|
|
(kill-buffer buf)
|
|
(setq default-directory dir)
|
|
(unload-feature 'ls-lisp 'force)
|
|
(require 'em-ls)
|
|
(let ((orig eshell-ls-use-in-dired))
|
|
(customize-set-value 'eshell-ls-use-in-dired t)
|
|
(setq buf (dired (expand-file-name "dir*/*.txt" dir)))
|
|
(dired-toggle-marks)
|
|
(should (cdr (dired-get-marked-files)))))
|
|
(delete-directory dir 'recursive)
|
|
(when (buffer-live-p buf) (kill-buffer buf)))))
|
|
|
|
|
|
(provide 'dired-tests)
|
|
;; dired-tests.el ends here
|