mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-09 21:20:45 -08:00
`string-replace` is easier to understand, less error-prone, much faster, and results in shorter Lisp and byte code. Use it where applicable and obviously safe (erring on the conservative side). * admin/authors.el (authors-scan-change-log): * lisp/autoinsert.el (auto-insert-alist): * lisp/calc/calc-prog.el (calc-edit-macro-combine-alg-ent) (calc-edit-macro-combine-ext-command) (calc-edit-macro-combine-var-name): * lisp/calc/calc-units.el (math-make-unit-string): * lisp/calendar/cal-html.el (cal-html-comment): * lisp/calendar/cal-tex.el (cal-tex-comment): * lisp/calendar/icalendar.el (icalendar--convert-string-for-export) (icalendar--convert-string-for-import): * lisp/calendar/iso8601.el (iso8601--concat-regexps) (iso8601--full-time-match, iso8601--combined-match): * lisp/calendar/time-date.el (format-seconds): * lisp/calendar/todo-mode.el (todo-filter-items-filename): * lisp/cedet/cedet-files.el (cedet-directory-name-to-file-name) (cedet-file-name-to-directory-name): * lisp/comint.el (comint-watch-for-password-prompt): * lisp/dired-aux.el (dired-do-chmod): * lisp/dired-x.el (dired-man): * lisp/dired.el (dired-insert-directory, dired-goto-file-1): * lisp/emacs-lisp/comp.el (comp-c-func-name): * lisp/emacs-lisp/re-builder.el (reb-copy): * lisp/erc/erc-dcc.el (erc-dcc-unquote-filename): * lisp/erc/erc.el (erc-quit-reason-zippy, erc-part-reason-zippy) (erc-update-mode-line-buffer, erc-message-english-PART): * lisp/files.el (make-backup-file-name-1, files--transform-file-name) (read-file-modes): * lisp/fringe.el (fringe-mode): * lisp/gnus/gnus-art.el (gnus-button-handle-info-url): * lisp/gnus/gnus-group.el (gnus-group-completing-read): * lisp/gnus/gnus-icalendar.el (gnus-icalendar-event-from-ical): * lisp/gnus/gnus-mlspl.el (gnus-group-split-fancy): * lisp/gnus/gnus-search.el (gnus-search-query-parse-date) (gnus-search-transform-expression, gnus-search-run-search): * lisp/gnus/gnus-start.el (gnus-dribble-enter): * lisp/gnus/gnus-sum.el (gnus-summary-refer-article): * lisp/gnus/gnus-util.el (gnus-mode-string-quote): * lisp/gnus/message.el (message-put-addresses-in-ecomplete) (message-parse-mailto-url, message-mailto-1): * lisp/gnus/mml-sec.el (mml-secure-epg-sign): * lisp/gnus/mml-smime.el (mml-smime-epg-verify): * lisp/gnus/mml2015.el (mml2015-epg-verify): * lisp/gnus/nnmaildir.el (nnmaildir--system-name) (nnmaildir-request-list, nnmaildir-retrieve-groups) (nnmaildir-request-group, nnmaildir-retrieve-headers): * lisp/gnus/nnrss.el (nnrss-node-text): * lisp/gnus/spam-report.el (spam-report-gmane-internal) (spam-report-user-mail-address): * lisp/ibuffer.el (name): * lisp/image-dired.el (image-dired-pngnq-thumb) (image-dired-pngcrush-thumb, image-dired-optipng-thumb) (image-dired-create-thumb-1): * lisp/info.el (Info-set-mode-line): * lisp/international/mule-cmds.el (describe-language-environment): * lisp/mail/rfc2231.el (rfc2231-parse-string): * lisp/mail/rfc2368.el (rfc2368-parse-mailto-url): * lisp/mail/rmail.el (rmail-insert-inbox-text) (rmail-simplified-subject-regexp): * lisp/mail/rmailout.el (rmail-output-body-to-file): * lisp/mail/undigest.el (rmail-digest-rfc1153): * lisp/man.el (Man-default-man-entry): * lisp/mouse.el (minor-mode-menu-from-indicator): * lisp/mpc.el (mpc--debug): * lisp/net/browse-url.el (browse-url-mail): * lisp/net/eww.el (eww-update-header-line-format): * lisp/net/newst-backend.el (newsticker-save-item): * lisp/net/rcirc.el (rcirc-sentinel): * lisp/net/soap-client.el (soap-decode-date-time): * lisp/nxml/rng-cmpct.el (rng-c-literal-2-re): * lisp/nxml/xmltok.el (let*): * lisp/obsolete/nnir.el (nnir-run-swish-e, nnir-run-hyrex) (nnir-run-find-grep): * lisp/play/dunnet.el (dun-doassign): * lisp/play/handwrite.el (handwrite): * lisp/proced.el (proced-format-args): * lisp/profiler.el (profiler-report-header-line-format): * lisp/progmodes/gdb-mi.el (gdb-mi-quote): * lisp/progmodes/make-mode.el (makefile-bsdmake-rule-action-regex) (makefile-make-font-lock-keywords): * lisp/progmodes/prolog.el (prolog-guess-fill-prefix): * lisp/progmodes/ruby-mode.el (ruby-toggle-string-quotes): * lisp/progmodes/sql.el (sql-remove-tabs-filter, sql-str-literal): * lisp/progmodes/which-func.el (which-func-current): * lisp/replace.el (query-replace-read-from) (occur-engine, replace-quote): * lisp/select.el (xselect--encode-string): * lisp/ses.el (ses-export-tab): * lisp/subr.el (shell-quote-argument): * lisp/term/pc-win.el (msdos-show-help): * lisp/term/w32-win.el (w32--set-selection): * lisp/term/xterm.el (gui-backend-set-selection): * lisp/textmodes/picture.el (picture-tab-search): * lisp/thumbs.el (thumbs-call-setroot-command): * lisp/tooltip.el (tooltip-show-help-non-mode): * lisp/transient.el (transient-format-key): * lisp/url/url-mailto.el (url-mailto): * lisp/vc/log-edit.el (log-edit-changelog-ours-p): * lisp/vc/vc-bzr.el (vc-bzr-status): * lisp/vc/vc-hg.el (vc-hg--glob-to-pcre): * lisp/vc/vc-svn.el (vc-svn-after-dir-status): * lisp/xdg.el (xdg-desktop-strings): * test/lisp/electric-tests.el (defun): * test/lisp/term-tests.el (term-simple-lines): * test/lisp/time-stamp-tests.el (formatz-mod-del-colons): * test/lisp/wdired-tests.el (wdired-test-bug32173-01) (wdired-test-unfinished-edit-01): * test/src/json-tests.el (json-parse-with-custom-null-and-false-objects): Use `string-replace` instead of `replace-regexp-in-string`.
199 lines
7.9 KiB
EmacsLisp
199 lines
7.9 KiB
EmacsLisp
;;; wdired-tests.el --- tests for wdired.el -*- lexical-binding: t; -*-
|
|
|
|
;; Copyright (C) 2018-2021 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 <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Code:
|
|
|
|
(require 'ert)
|
|
(require 'dired)
|
|
(require 'wdired)
|
|
|
|
(defvar dired-query) ; Pacify byte compiler.
|
|
|
|
(ert-deftest wdired-test-bug32173-01 ()
|
|
"Test using non-nil wdired-use-interactive-rename.
|
|
Partially modifying a file name should succeed."
|
|
(let* ((test-dir (make-temp-file "test-dir-" t))
|
|
(test-file (concat (file-name-as-directory test-dir) "foo.c"))
|
|
(replace "bar")
|
|
(new-file (string-replace "foo" replace test-file))
|
|
(wdired-use-interactive-rename t))
|
|
(write-region "" nil test-file nil 'silent)
|
|
(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")))
|
|
(let ((buf (find-file-noselect test-dir)))
|
|
(unwind-protect
|
|
(with-current-buffer buf
|
|
(should (equal (dired-file-name-at-point) test-file))
|
|
(dired-toggle-read-only)
|
|
(kill-region (point) (progn (search-forward ".")
|
|
(forward-char -1) (point)))
|
|
(insert replace)
|
|
(wdired-finish-edit)
|
|
(should (equal (dired-file-name-at-point) new-file)))
|
|
(if buf (kill-buffer buf))
|
|
(delete-directory test-dir t)))))
|
|
|
|
(ert-deftest wdired-test-bug32173-02 ()
|
|
"Test using non-nil wdired-use-interactive-rename.
|
|
Aborting an edit should leaving original file name unchanged."
|
|
(let* ((test-dir (make-temp-file "test-dir-" t))
|
|
(test-file (concat (file-name-as-directory test-dir) "foo.c"))
|
|
(wdired-use-interactive-rename t))
|
|
(write-region "" nil test-file nil 'silent)
|
|
;; Make dired-do-create-files-regexp a noop to mimic typing C-g
|
|
;; at its prompt before wdired-finish-edit returns.
|
|
(advice-add 'dired-do-create-files-regexp
|
|
:override
|
|
(lambda (&rest _) (ignore))
|
|
'((name . "advice-dired-do-create-files-regexp")))
|
|
(let ((buf (find-file-noselect test-dir)))
|
|
(unwind-protect
|
|
(with-current-buffer buf
|
|
(should (equal (dired-file-name-at-point) test-file))
|
|
(dired-toggle-read-only)
|
|
(kill-region (point) (progn (search-forward ".")
|
|
(forward-char -1) (point)))
|
|
(insert "bar")
|
|
(wdired-finish-edit)
|
|
(should (equal (dired-get-filename) test-file)))
|
|
(if buf (kill-buffer buf))
|
|
(delete-directory test-dir t)))))
|
|
|
|
(ert-deftest wdired-test-symlink-name ()
|
|
"Test the file name of a symbolic link.
|
|
The Dired and WDired functions returning the name should include
|
|
only the name before the link arrow."
|
|
(let* ((test-dir (make-temp-file "test-dir-" t))
|
|
(link-name "foo"))
|
|
(let ((buf (find-file-noselect test-dir)))
|
|
(unwind-protect
|
|
(with-current-buffer buf
|
|
(skip-unless
|
|
;; This check is for wdired, not symbolic links, so skip
|
|
;; it when make-symbolic-link fails for any reason (like
|
|
;; insufficient privileges).
|
|
(ignore-errors (make-symbolic-link "./bar/baz" link-name) t))
|
|
(revert-buffer)
|
|
(let* ((file-name (dired-get-filename))
|
|
(dir-part (file-name-directory file-name))
|
|
(lf-name (concat dir-part link-name)))
|
|
(should (equal file-name lf-name))
|
|
(dired-toggle-read-only)
|
|
(should (equal (wdired-get-filename) lf-name))
|
|
(dired-toggle-read-only)))
|
|
(if buf (kill-buffer buf))
|
|
(delete-directory test-dir t)))))
|
|
|
|
(ert-deftest wdired-test-unfinished-edit-01 ()
|
|
"Test editing a file name without saving the change.
|
|
Finding the new name should be possible while still in
|
|
wdired-mode."
|
|
(let* ((test-dir (make-temp-file "test-dir-" t))
|
|
(test-file (concat (file-name-as-directory test-dir) "foo.c"))
|
|
(replace "bar")
|
|
(new-file (string-replace "foo" replace test-file)))
|
|
(write-region "" nil test-file nil 'silent)
|
|
(let ((buf (find-file-noselect test-dir)))
|
|
(unwind-protect
|
|
(with-current-buffer buf
|
|
(should (equal (dired-file-name-at-point) test-file))
|
|
(dired-toggle-read-only)
|
|
(kill-region (point) (progn (search-forward ".")
|
|
(forward-char -1) (point)))
|
|
(insert replace)
|
|
(should (equal (dired-get-filename) new-file)))
|
|
(when buf
|
|
(with-current-buffer buf
|
|
;; Prevent kill-buffer-query-functions from chiming in.
|
|
(set-buffer-modified-p nil)
|
|
(kill-buffer buf)))
|
|
(delete-directory test-dir t)))))
|
|
|
|
(defvar server-socket-dir)
|
|
(declare-function dired-smart-shell-command "dired-x"
|
|
(command &optional output-buffer error-buffer))
|
|
|
|
(ert-deftest wdired-test-bug34915 ()
|
|
"Test editing when dired-listing-switches includes -F.
|
|
Appended file indicators should not count as part of the file
|
|
name, either before or after editing. Since
|
|
dired-move-to-end-of-filename handles indicator characters, it
|
|
suffices to compare the return values of dired-get-filename and
|
|
wdired-get-filename before and after editing."
|
|
;; FIXME: Add a test for a door (indicator ">") only under Solaris?
|
|
(let* ((test-dir (make-temp-file "test-dir-" t))
|
|
(server-socket-dir test-dir)
|
|
(dired-listing-switches "-Fl")
|
|
(dired-ls-F-marks-symlinks (eq system-type 'darwin))
|
|
(buf (find-file-noselect test-dir)))
|
|
(unwind-protect
|
|
(progn
|
|
(with-current-buffer buf
|
|
(dired-create-empty-file "foo")
|
|
(set-file-modes "foo" (file-modes-symbolic-to-number "+x"))
|
|
(make-symbolic-link "foo" "bar")
|
|
(make-directory "foodir")
|
|
(require 'dired-x)
|
|
(dired-smart-shell-command "mkfifo foopipe")
|
|
(server-force-delete)
|
|
;; FIXME? This seems a heavy-handed way of making a socket.
|
|
(server-start) ; Add a socket file.
|
|
(kill-buffer buf))
|
|
(dired test-dir)
|
|
(dired-toggle-read-only)
|
|
(let (names)
|
|
;; Test that the file names are the same in Dired and WDired.
|
|
(while (not (eobp))
|
|
(should (equal (dired-get-filename 'no-dir t)
|
|
(wdired-get-filename t)))
|
|
(insert "w")
|
|
(push (wdired-get-filename t) names)
|
|
(dired-next-line 1))
|
|
(wdired-finish-edit)
|
|
;; Test that editing the file names ignores the indicator
|
|
;; character.
|
|
(let (dir)
|
|
(while (and (dired-previous-line 1)
|
|
(setq dir (dired-get-filename 'no-dir t)))
|
|
(should (equal dir (pop names)))))))
|
|
(kill-buffer (get-buffer test-dir))
|
|
(server-force-delete)
|
|
(delete-directory test-dir t))))
|
|
|
|
(ert-deftest wdired-test-bug39280 ()
|
|
"Test for https://debbugs.gnu.org/39280."
|
|
(let* ((test-dir (make-temp-file "test-dir" 'dir))
|
|
(fname "foo")
|
|
(full-fname (expand-file-name fname test-dir)))
|
|
(make-empty-file full-fname)
|
|
(let ((buf (find-file-noselect test-dir)))
|
|
(unwind-protect
|
|
(with-current-buffer buf
|
|
(dired-toggle-read-only)
|
|
(dolist (old '(t nil))
|
|
(should (equal fname (wdired-get-filename 'nodir old)))
|
|
(should (equal full-fname (wdired-get-filename nil old))))
|
|
(wdired-finish-edit))
|
|
(if buf (kill-buffer buf))
|
|
(delete-directory test-dir t)))))
|
|
|
|
(provide 'wdired-tests)
|
|
;;; wdired-tests.el ends here
|