mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
8903106bb7
* lisp/subr.el (if-let*, when-let*, if-let, when-let): Mark if-let and when-let obsolete (bug#73853 and elsewhere). Move docstring text around so that if-let* and when-let* descriptions no longer refer to if-let and when-let. * etc/NEWS: Announce the change. * admin/admin.el (reminder-for-release-blocking-bugs): * doc/misc/erc.texi (display-buffer): * lisp/ansi-color.el (ansi-color-apply) (ansi-color--face-vec-face): * lisp/ansi-osc.el (ansi-osc-apply-on-region) (ansi-osc-hyperlink): * lisp/arc-mode.el (archive-goto-file) (archive-next-file-displayer): * lisp/auth-source-pass.el (auth-source-pass-search) (auth-source-pass--parse-data) (auth-source-pass--find-match-many): * lisp/autorevert.el (auto-revert-notify-rm-watch): * lisp/buff-menu.el (Buffer-menu-unmark-all-buffers) (Buffer-menu-group-by-root): * lisp/calendar/parse-time.el (parse-iso8601-time-string): * lisp/cedet/pulse.el (pulse-tick): * lisp/comint.el (comint--fontify-input-ppss-flush-indirect) (comint--intersect-regions): * lisp/completion-preview.el (completion-preview--try-table) (completion-preview--capf-wrapper, completion-preview--update): * lisp/cus-edit.el (setopt--set) (custom-dirlocals-maybe-update-cons, custom-dirlocals-validate): * lisp/custom.el (load-theme): * lisp/descr-text.el (describe-char): * lisp/desktop.el (desktop--emacs-pid-running-p): * lisp/dired-x.el (menu): * lisp/dired.el (dired-font-lock-keywords) (dired-insert-directory, dired--insert-disk-space, dired-mode): * lisp/dnd.el (dnd-handle-multiple-urls): * lisp/dom.el (dom-remove-attribute): * lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): * lisp/emacs-lisp/bytecomp.el (bytecomp--custom-declare): * lisp/emacs-lisp/comp-common.el (comp-function-type-spec): * lisp/emacs-lisp/comp-cstr.el (comp--all-classes) (comp-cstr-set-range-for-arithm, comp--cstr-union-1-no-mem) (comp-cstr-intersection-no-mem, comp-cstr-fixnum-p) (comp-cstr-type-p): * lisp/emacs-lisp/comp-run.el (comp-subr-trampoline-install) (native--compile-async): * lisp/emacs-lisp/comp.el (comp--get-function-cstr) (comp--function-pure-p, comp--intern-func-in-ctxt) (comp--addr-to-bb-name, comp--emit-assume, comp--maybe-add-vmvar) (comp--add-call-cstr, comp--compute-dominator-tree) (comp--dom-tree-walker, comp--ssa-rename) (comp--function-call-maybe-fold, comp--fwprop-call) (comp--call-optim-func): * lisp/emacs-lisp/edebug.el (edebug-global-prefix) (edebug-remove-instrumentation): * lisp/emacs-lisp/eieio.el (initialize-instance): * lisp/emacs-lisp/ert-x.el (ert-resource-directory): * lisp/emacs-lisp/ert.el (ert--expand-should-1) (ert-test-location, ert-write-junit-test-report) (ert-test--erts-test): * lisp/emacs-lisp/icons.el (icon-complete-spec, icon-string) (icons--create): * lisp/emacs-lisp/lisp-mode.el (lisp--local-defform-body-p): * lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate--make-autoload) (loaddefs-generate--parse-file): * lisp/emacs-lisp/multisession.el (multisession-edit-mode--revert, multisession-edit-value): * lisp/emacs-lisp/package-vc.el (package-vc--read-archive-data) (package-vc--version, package-vc--clone): * lisp/emacs-lisp/package.el (package--reload-previously-loaded): * lisp/emacs-lisp/pp.el (pp--insert-lisp): * lisp/emacs-lisp/subr-x.el (add-display-text-property): * lisp/emacs-lisp/tabulated-list.el (tabulated-list-print): * lisp/emacs-lisp/timer.el (run-at-time): * lisp/emacs-lisp/vtable.el (vtable-goto-table) (vtable-goto-column, vtable-update-object, vtable--insert-line) (vtable--compute-widths, vtable--make-keymap): * lisp/emacs-lisp/warnings.el (display-warning): * lisp/epa-file.el (epa-file-insert-file-contents): * lisp/epa.el (epa-show-key): * lisp/erc/erc-backend.el (erc--split-line, erc--conceal-prompt) (PRIVMSG, erc--get-isupport-entry): * lisp/erc/erc-button.el (erc-button-add-nickname-buttons) (erc--button-next): * lisp/erc/erc-common.el (erc--find-group): * lisp/erc/erc-fill.el (erc-fill, erc-fill-static) (erc-fill--wrap-escape-hidden-speaker) (erc-fill--wrap-unmerge-on-date-stamp) (erc-fill--wrap-massage-initial-message-post-clear) (erc-fill-wrap, erc-fill--wrap-rejigger-region): * lisp/erc/erc-goodies.el (erc--scrolltobottom-all) (erc--keep-place-indicator-on-window-buffer-change) (keep-place-indicator, erc--keep-place-indicator-adjust-on-clear) (erc-keep-place-move, erc--command-indicator-display): * lisp/erc/erc-ibuffer.el (erc-members): * lisp/erc/erc-join.el (erc-join--remove-requested-channel) (erc-autojoin--join): * lisp/erc/erc-networks.el (erc-networks--id-qualifying-init-parts, erc-networks--id-reload) (erc-networks--id-ensure-comparable) (erc-networks--reclaim-orphaned-target-buffers) (erc-networks--server-select): * lisp/erc/erc-nicks.el (erc-nicks-invert) (erc-nicks--redirect-face-widget-link, erc-nicks--highlight) (erc-nicks--highlight-button) (erc-nicks--list-faces-help-button-action, erc-nicks-list-faces) (erc-nicks-refresh, erc-nicks--colors-from-faces) (erc-nicks--track-prioritize) (erc-nicks--remember-face-for-track): * lisp/erc/erc-notify.el (querypoll, erc--querypoll-get-next) (erc--querypoll-on-352, erc--querypoll-send): * lisp/erc/erc-sasl.el (erc-sasl--read-password): * lisp/erc/erc-services.el (erc-services-issue-ghost-and-retry-nick): * lisp/erc/erc-speedbar.el (erc-speedbar--ensure, nickbar) (erc-speedbar-toggle-nicknames-window-lock) (erc-speedbar--compose-nicks-face): * lisp/erc/erc-stamp.el (erc-stamp--recover-on-reconnect) (erc-stamp-prefix-log-filter, erc--conceal-prompt) (erc--insert-timestamp-left, erc-insert-timestamp-right) (erc-stamp--defer-date-insertion-on-post-modify) (erc-insert-timestamp-left-and-right) (erc-stamp--redo-right-stamp-post-clear) (erc-stamp--reset-on-clear, erc-stamp--dedupe-date-stamps): * lisp/erc/erc-status-sidebar.el (bufbar) (erc-status-sidebar-prefer-target-as-name) (erc-status-sidebar-default-allsort, erc-status-sidebar-click): * lisp/erc/erc-track.el (erc-track--shortened-names-get) (erc-track--setup, erc-track--select-mode-line-face) (erc-track-modified-channels, erc-track--collect-faces-in) (erc-track--switch-buffer, erc-track--replace-killed-buffer): * lisp/erc/erc-truncate.el (erc-truncate--setup) (erc-truncate-buffer): * lisp/erc/erc.el (erc--ensure-query-member) (erc--ensure-query-members, erc--remove-channel-users-but) (erc--cusr-change-status, erc--find-mode, erc--update-modules) (erc-log-irc-protocol, erc--refresh-prompt) (erc--restore-important-text-props) (erc--order-text-properties-from-hash, erc-send-input-line) (erc-cmd-IGNORE, erc--unignore-user, erc-cmd-QUERY) (erc-cmd-BANLIST, erc--speakerize-nick) (erc--format-speaker-input-message, erc-channel-receive-names) (erc-send-current-line, erc-format-target-and/or-network) (erc-kill-buffer-function, erc-restore-text-properties) (erc--get-eq-comparable-cmd): * lisp/eshell/em-alias.el (eshell-maybe-replace-by-alias--which) (eshell-maybe-replace-by-alias): * lisp/eshell/em-glob.el (eshell-glob-convert): * lisp/eshell/em-pred.el (eshell-pred-user-or-group) (eshell-pred-file-time, eshell-pred-file-type) (eshell-pred-file-mode, eshell-pred-file-links) (eshell-pred-file-size): * lisp/eshell/em-prompt.el (eshell-forward-paragraph) (eshell-next-prompt): * lisp/eshell/esh-arg.el (eshell-resolve-current-argument): * lisp/eshell/esh-cmd.el (eshell-do-eval, eshell/which) (eshell-plain-command--which, eshell-plain-command): * lisp/eshell/esh-io.el (eshell-duplicate-handles) (eshell-protect-handles, eshell-get-target, eshell-close-target): * lisp/eshell/esh-proc.el (eshell-sentinel): * lisp/eshell/esh-var.el (eshell-parse-variable-ref) (eshell-get-variable, eshell-set-variable): * lisp/faces.el (face-at-point): * lisp/ffap.el (ffap-in-project): * lisp/filenotify.el (file-notify--rm-descriptor): * lisp/files-x.el (read-dir-locals-file) (connection-local-update-profile-variables) (connection-local-value): * lisp/files.el (file-remote-p, abbreviate-file-name) (set-auto-mode, hack-local-variables) (revert-buffer-restore-read-only): * lisp/find-dired.el (find-dired-sort-by-filename): * lisp/font-lock.el (font-lock--filter-keywords): * lisp/gnus/gnus-art.el (article-emojize-symbols): * lisp/gnus/gnus-int.el (gnus-close-server): * lisp/gnus/gnus-search.el (gnus-search-transform) (gnus-search-indexed-parse-output, gnus-search-server-to-engine): * lisp/gnus/gnus-sum.el (gnus-collect-urls, gnus-shorten-url): * lisp/gnus/gnus.el (gnus-check-backend-function): * lisp/gnus/message.el (message-send-mail): * lisp/gnus/mml.el (mml-generate-mime, mml-insert-mime-headers): * lisp/gnus/nnatom.el (nnatom--read-feed, nnatom--read-article) (nnatom--read-article-or-group-authors, nnatom--read-publish) (nnatom--read-update, nnatom--read-links): * lisp/gnus/nnfeed.el (nnfeed--read-server, nnfeed--write-server) (nnfeed--parse-feed, nnfeed--group-data, nnfeed-retrieve-article) (nnfeed-retrieve-headers, nnfeed--print-part) (nnfeed-request-article, nnfeed-request-group) (nnfeed-request-list, nnfeed--group-description) (nnfeed-request-group-description) (nnfeed-request-list-newsgroups, nnfeed-request-rename-group): * lisp/gnus/nnmh.el (nnmh-update-gnus-unreads): * lisp/help-fns.el (help-find-source) (help-fns--insert-menu-bindings, help-fns--mention-first-release) (help-fns--mention-shortdoc-groups) (help-fns--customize-variable-version) (help-fns--face-custom-version-info, describe-mode): * lisp/help-mode.el (help-make-xrefs): * lisp/help.el (help-key-description, help--describe-command): * lisp/hfy-cmap.el (htmlfontify-load-rgb-file): * lisp/ibuf-ext.el (ibuffer-jump-to-filter-group) (ibuffer-kill-filter-group, ibuffer-kill-line) (ibuffer-save-filter-groups, ibuffer-save-filters, filename) (basename, file-extension, ibuffer-diff-buffer-with-file-1) (ibuffer-mark-by-file-name-regexp) (ibuffer-mark-by-content-regexp): * lisp/ibuf-macs.el (ibuffer-aif, ibuffer-awhen): * lisp/ibuffer.el (ibuffer-mouse-toggle-mark) (ibuffer-toggle-marks, ibuffer-mark-interactive) (ibuffer-compile-format, process, ibuffer-map-lines): * lisp/image.el (image--compute-map) (image--compute-original-map): * lisp/image/exif.el (exif-parse-buffer): * lisp/image/image-converter.el (image-convert-p, image-convert) (image-converter--find-converter): * lisp/image/image-dired-util.el (image-dired-file-name-at-point): * lisp/image/image-dired.el (image-dired-track-original-file) (image-dired--on-file-in-dired-buffer) (image-dired--with-thumbnail-buffer) (image-dired-jump-original-dired-buffer) (image-dired--slideshow-step, image-dired-display-image): * lisp/image/wallpaper.el (wallpaper--init-action-kill) (wallpaper--find-setter, wallpaper--find-command) (wallpaper--find-command-args, wallpaper--x-monitor-name): * lisp/info-look.el (info-lookup-interactive-arguments) (info-complete)::(:mode): * lisp/info.el (info-pop-to-buffer, Info-read-node-name-1): * lisp/international/emoji.el (emoji--adjust-displayable-1) (emoji--add-recent): * lisp/jsonrpc.el (jsonrpc--call-deferred) (jsonrpc--process-sentinel, jsonrpc--remove): * lisp/keymap.el (keymap-local-lookup): * lisp/mail/emacsbug.el (report-emacs-bug-hook) (submit-emacs-patch): * lisp/mail/ietf-drums.el (ietf-drums-parse-addresses): * lisp/mail/mailclient.el (mailclient-send-it): * lisp/mail/rfc6068.el (rfc6068-parse-mailto-url): * lisp/mail/undigest.el (rmail-digest-parse-mixed-mime): * lisp/minibuffer.el (completion-metadata-get) (completions--after-change) (minibuffer-visible-completions--filter): * lisp/net/browse-url.el (browse-url-url-at-point) (browse-url-file-url, browse-url-emacs): * lisp/net/dbus.el (dbus-byte-array-to-string) (dbus-monitor-goto-serial): * lisp/net/dictionary.el (dictionary-search): * lisp/net/eww.el (eww--download-directory) (eww-auto-rename-buffer, eww-open-in-new-buffer, eww-submit) (eww-follow-link, eww-read-alternate-url) (eww-copy-alternate-url): * lisp/net/goto-addr.el (goto-address-at-point): * lisp/net/mailcap.el (mailcap-mime-info): * lisp/net/rcirc.el (rcirc, rcirc-connect, rcirc-send-string) (rcirc-kill-buffer-hook, rcirc-print, rcirc-when) (rcirc-color-attributes, rcirc-handler-NICK) (rcirc-handler-TAGMSG, rcirc-handler-BATCH): * lisp/net/shr.el (shr-descend, shr-adaptive-fill-function) (shr-correct-dom-case, shr-tag-a): * lisp/net/sieve.el (sieve-manage-quit): * lisp/outline.el (outline-cycle-buffer): * lisp/pcmpl-git.el (pcmpl-git--tracked-file-predicate): * lisp/proced.el (proced-auto-update-timer): * lisp/progmodes/bug-reference.el (bug-reference-try-setup-from-vc): * lisp/progmodes/c-ts-common.el (c-ts-common--fill-paragraph): * lisp/progmodes/c-ts-mode.el (c-ts-mode--preproc-offset) (c-ts-mode--anchor-prev-sibling, c-ts-mode-indent-defun): * lisp/progmodes/compile.el (compilation-error-properties) (compilation-find-file-1): * lisp/progmodes/eglot.el (eglot--check-object) (eglot--read-server, eglot-upgrade-eglot) (eglot-handle-notification, eglot--CompletionParams) (eglot-completion-at-point, eglot--sig-info) (eglot-register-capability): * lisp/progmodes/elisp-mode.el (emacs-lisp-native-compile-and-load) (elisp-eldoc-var-docstring-with-value): * lisp/progmodes/erts-mode.el (erts-mode--goto-start-of-test): * lisp/progmodes/flymake.el (flymake--update-eol-overlays) (flymake-eldoc-function): * lisp/progmodes/gdb-mi.el (gdb-breakpoints-list-handler-custom) (gdb-frame-handler): * lisp/progmodes/go-ts-mode.el (go-ts-mode-docstring) (go-ts-mode--comment-on-previous-line-p) (go-ts-mode--get-test-regexp-at-point) (go-ts-mode-test-this-file): * lisp/progmodes/grep.el (lgrep, rgrep-default-command) (grep-file-at-point): * lisp/progmodes/perl-mode.el (perl--end-of-format-p): * lisp/progmodes/php-ts-mode.el (php-ts-mode--anchor-prev-sibling, php-ts-mode--indent-defun): * lisp/progmodes/project.el (project--other-place-command) (project--find-default-from, project--transplant-file-name) (project-prefixed-buffer-name, project--remove-from-project-list) (project-prompt-project-name, project-remember-projects-under) (project--switch-project-command) (project-uniquify-dirname-transform, project-mode-line-format): * lisp/progmodes/python.el (python-font-lock-keywords-maximum-decoration) (python--treesit-fontify-union-types) (python-shell-get-process-name, python-shell-restart) (python-shell-completion-at-point, python-ffap-module-path) (python-util-comint-end-of-output-p, python--import-sources) (python-add-import, python-remove-import, python-fix-imports): * lisp/progmodes/xref.el (xref--add-log-current-defun): * lisp/repeat.el (repeat-echo-message-string): * lisp/saveplace.el (save-place-dired-hook): * lisp/server.el (server-save-buffers-kill-terminal): * lisp/shadowfile.el (shadow-make-fullname) (shadow-contract-file-name, shadow-define-literal-group): * lisp/shell.el (shell-highlight-undef-mode): * lisp/simple.el (command-completion-using-modes-p) (command-execute, file-user-uid, file-group-gid) (first-completion, last-completion, switch-to-completions): * lisp/startup.el (startup--load-user-init-file): * lisp/tab-line.el (tab-line-tabs-buffer-group-by-project): * lisp/tar-mode.el (tar-goto-file, tar-next-file-displayer): * lisp/term/android-win.el (android-encode-select-string) (gui-backend-set-selection): * lisp/term/haiku-win.el (haiku-dnd-convert-string) (haiku-select-encode-xstring, haiku-select-encode-utf-8-string): * lisp/textmodes/emacs-news-mode.el (emacs-news--buttonize): * lisp/textmodes/ispell.el (ispell-completion-at-point): * lisp/textmodes/sgml-mode.el (sgml-validate) (html-mode--complete-at-point): * lisp/textmodes/tex-mode.el (tex-recenter-output-buffer) (xref-backend-references): * lisp/thingatpt.el (thing-at-point-file-at-point) (thing-at-point-face-at-point): * lisp/thread.el (thread-list--get-status): * lisp/time.el (world-clock-copy-time-as-kill, world-clock): * lisp/touch-screen.el (touch-screen-handle-touch): * lisp/treesit.el (treesit-language-at, treesit-node-at) (treesit-node-on, treesit-buffer-root-node) (treesit-node-field-name, treesit-local-parsers-at) (treesit-local-parsers-on, treesit--cleanup-local-range-overlays) (treesit-font-lock-recompute-features) (treesit-font-lock-fontify-region, treesit-transpose-sexps) (treesit-add-log-current-defun, treesit-major-mode-setup) (treesit--explorer-refresh, treesit-install-language-grammar): * lisp/url/url.el (url-retrieve-synchronously): * lisp/vc/smerge-mode.el (smerge-diff): * lisp/vc/vc-dir.el (vc-dir): * lisp/vc/vc-dispatcher.el (vc-do-async-command): * lisp/vc/vc-git.el (vc-git-dir--branch-headers) (vc-git-dir--stash-headers, vc-git--log-edit-summary-check) (vc-git-stash-list): * lisp/vc/vc.el (vc-responsible-backend, vc-buffer-sync-fileset) (vc-clone): * lisp/visual-wrap.el (visual-wrap--apply-to-line): * lisp/wid-edit.el (widget-text) (widget-editable-list-insert-before): * lisp/window-tool-bar.el (window-tool-bar--keymap-entry-to-string): * lisp/window.el (display-buffer, display-buffer-full-frame) (window-point-context-set, window-point-context-use) (window-point-context-use-default-function): * lisp/xdg.el (xdg-current-desktop): * lisp/xwidget.el (xwidget-webkit-callback): * lisp/yank-media.el (yank-media--get-selection) (yank-media-types): * test/lisp/comint-tests.el (comint-tests/test-password-function): * test/lisp/completion-preview-tests.el (completion-preview-tests--capf): * test/lisp/cus-edit-tests.el (with-cus-edit-test): * test/lisp/erc/erc-scenarios-base-local-modules.el (-phony-sblm-): * test/lisp/erc/erc-scenarios-stamp.el (erc-scenarios-stamp--on-post-modify): * test/lisp/erc/erc-services-tests.el (erc-services-tests--asp-parse-entry): * test/lisp/erc/erc-tests.el (erc-modules--internal-property) (erc--find-mode, erc-tests--update-modules): * test/lisp/erc/resources/erc-d/erc-d-i.el (erc-d-i--parse-message): * test/lisp/erc/resources/erc-d/erc-d-t.el (erc-d-t-kill-related-buffers, erc-d-t-with-cleanup): * test/lisp/erc/resources/erc-d/erc-d-tests.el (erc-d-i--parse-message--irc-parser-tests): * test/lisp/erc/resources/erc-d/erc-d-u.el (erc-d-u--read-exchange-slowly): * test/lisp/erc/resources/erc-d/erc-d.el (erc-d--expire) (erc-d--finalize-done, erc-d--command-handle-all): * test/lisp/erc/resources/erc-scenarios-common.el (erc-scenarios-common-with-cleanup): * test/lisp/erc/resources/erc-tests-common.el (erc-tests--common-display-message) (erc-tests-common-create-subprocess): * test/lisp/ibuffer-tests.el (ibuffer-test-Bug25058): * test/lisp/international/mule-tests.el (mule-cmds-tests--ucs-names-missing-names): * test/lisp/progmodes/python-tests.el (python-tests-get-shell-interpreter) (python-tests--get-interpreter-info): * test/lisp/progmodes/ruby-ts-mode-tests.el (ruby-ts-resource-file): * test/lisp/replace-tests.el (replace-tests-with-undo): * test/src/emacs-tests.el (emacs-tests--seccomp-debug): * test/src/process-tests.el (process-tests--emacs-command) (process-tests--emacs-binary, process-tests--dump-file): * test/src/treesit-tests.el (treesit--ert-test-defun-navigation): Replace use of the now-obsolete if-let and when-let.
829 lines
41 KiB
EmacsLisp
829 lines
41 KiB
EmacsLisp
;;; ibuffer-tests.el --- Test suite. -*- lexical-binding: t -*-
|
|
|
|
;; Copyright (C) 2015-2024 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 'ibuffer)
|
|
(eval-when-compile
|
|
(require 'ibuf-macs))
|
|
|
|
(defvar ibuffer-filter-groups)
|
|
(defvar ibuffer-filtering-alist)
|
|
(defvar ibuffer-filtering-qualifiers)
|
|
(defvar ibuffer-save-with-custom)
|
|
(defvar ibuffer-saved-filter-groups)
|
|
(defvar ibuffer-saved-filters)
|
|
(declare-function ibuffer-format-qualifier "ibuf-ext" (qualifier))
|
|
(declare-function ibuffer-unary-operand "ibuf-ext" (filter))
|
|
|
|
(ert-deftest ibuffer-0autoload () ; sort first
|
|
"Tests to see whether ibuffer has been autoloaded"
|
|
(skip-when (featurep 'ibuf-ext))
|
|
(should
|
|
(fboundp 'ibuffer-mark-unsaved-buffers))
|
|
(should
|
|
(autoloadp
|
|
(symbol-function
|
|
'ibuffer-mark-unsaved-buffers))))
|
|
|
|
(ert-deftest ibuffer-test-Bug24997 ()
|
|
"Test for https://debbugs.gnu.org/24997 ."
|
|
(ibuffer)
|
|
(let ((orig ibuffer-filtering-qualifiers))
|
|
(unwind-protect
|
|
(progn
|
|
(setq ibuffer-filtering-qualifiers
|
|
'((size-gt . 10)
|
|
(used-mode . lisp-interaction-mode)))
|
|
(ibuffer-update nil t)
|
|
(ignore-errors (ibuffer-decompose-filter))
|
|
(should (cdr ibuffer-filtering-qualifiers)))
|
|
(setq ibuffer-filtering-qualifiers orig)
|
|
(ibuffer-update nil t))))
|
|
|
|
(ert-deftest ibuffer-test-Bug25000 ()
|
|
"Test for https://debbugs.gnu.org/25000 ."
|
|
(let ((case-fold-search t)
|
|
(buf1 (generate-new-buffer "ibuffer-test-Bug25000-buf1"))
|
|
(buf2 (generate-new-buffer "ibuffer-test-Bug25000-buf2")))
|
|
(ibuffer)
|
|
(unwind-protect
|
|
(ibuffer-save-marks
|
|
(ibuffer-unmark-all-marks)
|
|
(ibuffer-mark-by-name-regexp (buffer-name buf1))
|
|
(ibuffer-change-marks ibuffer-marked-char ?L)
|
|
(ibuffer-mark-by-name-regexp (buffer-name buf2))
|
|
(ibuffer-change-marks ibuffer-marked-char ?l)
|
|
(should-not (cdr (ibuffer-buffer-names-with-mark ?l))))
|
|
(mapc (lambda (buf) (when (buffer-live-p buf)
|
|
(kill-buffer buf))) (list buf1 buf2)))))
|
|
|
|
(ert-deftest ibuffer-save-filters ()
|
|
"Tests that `ibuffer-save-filters' saves in the proper format."
|
|
(require 'ibuf-ext)
|
|
(let ((ibuffer-save-with-custom nil)
|
|
(ibuffer-saved-filters nil)
|
|
(test1 '((mode . org-mode)
|
|
(or (size-gt . 10000)
|
|
(and (not (starred-name))
|
|
(directory . "<org>")))))
|
|
(test2 '((or (mode . emacs-lisp-mode) (file-extension . "elc?")
|
|
(and (starred-name) (name . "elisp"))
|
|
(mode . lisp-interaction-mode))))
|
|
(test3 '((size-lt . 100) (derived-mode . prog-mode)
|
|
(or (filename . "scratch")
|
|
(filename . "bonz")
|
|
(filename . "temp")))))
|
|
(ibuffer-save-filters "test1" test1)
|
|
(should (equal (car ibuffer-saved-filters) (cons "test1" test1)))
|
|
(ibuffer-save-filters "test2" test2)
|
|
(should (equal (car ibuffer-saved-filters) (cons "test2" test2)))
|
|
(should (equal (cadr ibuffer-saved-filters) (cons "test1" test1)))
|
|
(ibuffer-save-filters "test3" test3)
|
|
(should (equal (car ibuffer-saved-filters) (cons "test3" test3)))
|
|
(should (equal (cadr ibuffer-saved-filters) (cons "test2" test2)))
|
|
(should (equal (car (cddr ibuffer-saved-filters)) (cons "test1" test1)))
|
|
(should (equal (cdr (assoc "test1" ibuffer-saved-filters)) test1))
|
|
(should (equal (cdr (assoc "test2" ibuffer-saved-filters)) test2))
|
|
(should (equal (cdr (assoc "test3" ibuffer-saved-filters)) test3))))
|
|
|
|
(ert-deftest ibuffer-test-Bug25058 ()
|
|
"Test for https://debbugs.gnu.org/25058 ."
|
|
(ibuffer)
|
|
(let ((orig-filters ibuffer-saved-filter-groups)
|
|
(tmp-filters '(("saved-filters"
|
|
("Shell"
|
|
(used-mode . shell-mode))
|
|
("Elisp"
|
|
(or
|
|
(used-mode . emacs-lisp-mode)
|
|
(used-mode . lisp-interaction-mode)))
|
|
("Dired"
|
|
(used-mode . dired-mode))
|
|
("Info"
|
|
(or
|
|
(used-mode . help-mode)
|
|
(used-mode . debugger-mode)
|
|
(used-mode . Custom-mode)
|
|
(used-mode . completion-list-mode)
|
|
(name . "\\`[*]Messages[*]\\'")))))))
|
|
(unwind-protect
|
|
(progn
|
|
(setq ibuffer-saved-filter-groups tmp-filters)
|
|
(ibuffer-switch-to-saved-filter-groups "saved-filters")
|
|
(ibuffer-decompose-filter-group "Elisp")
|
|
(ibuffer-filter-disable)
|
|
(ibuffer-switch-to-saved-filter-groups "saved-filters")
|
|
(should (assoc "Elisp" (cdar ibuffer-saved-filter-groups))))
|
|
(setq ibuffer-saved-filter-groups orig-filters)
|
|
(when-let* ((it (get-buffer "*Ibuffer*")))
|
|
(and (buffer-live-p it) (kill-buffer it))))))
|
|
|
|
|
|
(ert-deftest ibuffer-test-Bug25042 ()
|
|
"Test for https://debbugs.gnu.org/25042 ."
|
|
(ibuffer)
|
|
(let ((filters ibuffer-filtering-qualifiers))
|
|
(unwind-protect
|
|
(progn
|
|
(ignore-errors ; Mistyped `match-string' instead of `string-match'.
|
|
(setq ibuffer-filtering-qualifiers nil)
|
|
(ibuffer-filter-by-predicate '(match-string "foo" (buffer-name))))
|
|
(should-not ibuffer-filtering-qualifiers))
|
|
(setq ibuffer-filtering-qualifiers filters))))
|
|
|
|
;; Test Filter Inclusion
|
|
(let* (test-buffer-list ; accumulated buffers to clean up
|
|
test-file-list
|
|
;; Utility functions without polluting the environment
|
|
(set-buffer-mode
|
|
(lambda (buffer mode)
|
|
"Set BUFFER's major mode to MODE, a mode function, or fundamental."
|
|
(with-current-buffer buffer
|
|
(funcall (or mode #'fundamental-mode)))))
|
|
(set-buffer-contents
|
|
(lambda (buffer size include-content)
|
|
"Add exactly SIZE bytes to BUFFER, including INCLUDE-CONTENT."
|
|
(when (or size include-content)
|
|
(let* ((unit "\n")
|
|
(chunk "ccccccccccccccccccccccccccccccc\n")
|
|
(chunk-size (length chunk))
|
|
(size (if (and size include-content (stringp include-content))
|
|
(- size (length include-content))
|
|
size)))
|
|
(unless (or (null size) (> size 0))
|
|
(error "size argument must be nil or positive"))
|
|
(with-current-buffer buffer
|
|
(when include-content
|
|
(insert include-content))
|
|
(when size
|
|
(dotimes (_ (floor size chunk-size))
|
|
(insert chunk))
|
|
(dotimes (_ (mod size chunk-size))
|
|
(insert unit)))
|
|
;; prevent query on cleanup
|
|
(set-buffer-modified-p nil))))))
|
|
(create-file-buffer
|
|
(lambda (prefix &rest args-plist)
|
|
"Create a file and buffer with designated properties.
|
|
PREFIX is a string giving the beginning of the name, and ARGS-PLIST
|
|
is a series of keyword-value pairs, with allowed keywords
|
|
:suffix STRING, :size NUMBER, :mode MODE-FUNC, :include-content STRING.
|
|
Returns the created buffer."
|
|
(let* ((suffix (plist-get args-plist :suffix))
|
|
(size (plist-get args-plist :size))
|
|
(include (plist-get args-plist :include-content))
|
|
(mode (plist-get args-plist :mode))
|
|
(file (make-temp-file prefix nil suffix))
|
|
(buf (find-file-noselect file t)))
|
|
(push buf test-buffer-list) ; record for cleanup
|
|
(push file test-file-list)
|
|
(funcall set-buffer-mode buf mode)
|
|
(funcall set-buffer-contents buf size include)
|
|
buf)))
|
|
(create-non-file-buffer
|
|
(lambda (prefix &rest args-plist)
|
|
"Create a non-file and buffer with designated properties.
|
|
PREFIX is a string giving the beginning of the name, and ARGS-PLIST
|
|
is a series of keyword-value pairs, with allowed keywords
|
|
:size NUMBER, :mode MODE-FUNC, :include-content STRING.
|
|
Returns the created buffer."
|
|
(let* ((size (plist-get args-plist :size))
|
|
(include (plist-get args-plist :include-content))
|
|
(mode (plist-get args-plist :mode))
|
|
(buf (generate-new-buffer prefix)))
|
|
(push buf test-buffer-list) ; record for cleanup
|
|
(funcall set-buffer-mode buf mode)
|
|
(funcall set-buffer-contents buf size include)
|
|
buf)))
|
|
(clean-up
|
|
(lambda ()
|
|
"Restore all emacs state modified during the tests"
|
|
(dolist (f test-file-list)
|
|
(and f (file-exists-p f) (delete-file f)))
|
|
(while test-buffer-list ; created temporary buffers
|
|
(let ((buf (pop test-buffer-list)))
|
|
(with-current-buffer buf (bury-buffer)) ; ensure not selected
|
|
(kill-buffer buf))))))
|
|
;; Tests
|
|
(ert-deftest ibuffer-filter-inclusion-1 ()
|
|
"Tests inclusion using basic filter combinators with a single buffer."
|
|
(require 'ibuf-ext)
|
|
(unwind-protect
|
|
(let ((buf
|
|
(funcall create-file-buffer "ibuf-test-1" :size 100
|
|
:include-content "One ring to rule them all\n")))
|
|
(should (ibuffer-included-in-filters-p buf '((size-gt . 99))))
|
|
(should (ibuffer-included-in-filters-p buf '((size-lt . 101))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((mode . fundamental-mode))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((content . "ring to rule them all"))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((and (content . "ring to rule them all")))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((and (and (content . "ring to rule them all"))))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((and (and (and (content . "ring to rule them all")))))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((or (content . "ring to rule them all")))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((not (not (content . "ring to rule them all"))))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((and (size-gt . 99)
|
|
(content . "ring to rule them all")
|
|
(mode . fundamental-mode)
|
|
(basename . "\\`ibuf-test-1")))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((not (or (not (size-gt . 99))
|
|
(not (content . "ring to rule them all"))
|
|
(not (mode . fundamental-mode))
|
|
(not (basename . "\\`ibuf-test-1")))))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((and (or (size-gt . 99) (size-lt . 10))
|
|
(and (content . "ring.*all")
|
|
(content . "rule")
|
|
(content . "them all")
|
|
(content . "One"))
|
|
(not (mode . text-mode))
|
|
(basename . "\\`ibuf-test-1"))))))
|
|
(funcall clean-up)))
|
|
|
|
(ert-deftest ibuffer-filter-inclusion-2 ()
|
|
"Tests inclusion of basic filters in combination on a single buffer."
|
|
(require 'ibuf-ext)
|
|
(unwind-protect
|
|
(let ((buf
|
|
(funcall create-file-buffer "ibuf-test-2" :size 200
|
|
:mode #'text-mode
|
|
:include-content "and in the darkness find them\n")))
|
|
(should (ibuffer-included-in-filters-p buf '((size-gt . 199))))
|
|
(should (ibuffer-included-in-filters-p buf '((size-lt . 201))))
|
|
(should (ibuffer-included-in-filters-p buf '((not size-gt . 200))))
|
|
(should (ibuffer-included-in-filters-p buf '((not (size-gt . 200)))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((and (size-gt . 199) (size-lt . 201)))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((or (size-gt . 199) (size-gt . 201)))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((or (size-gt . 201) (size-gt . 199)))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((size-gt . 199) (mode . text-mode)
|
|
(content . "darkness find them"))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((and (size-gt . 199) (mode . text-mode)
|
|
(content . "darkness find them")))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((not (or (not (size-gt . 199)) (not (mode . text-mode))
|
|
(not (content . "darkness find them")))))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((or (size-gt . 200) (content . "darkness find them")
|
|
(derived-mode . emacs-lisp-mode)))))
|
|
(should-not (ibuffer-included-in-filters-p
|
|
buf '((or (size-gt . 200) (content . "rule them all")
|
|
(derived-mode . emacs-lisp-mode))))))
|
|
(funcall clean-up)))
|
|
|
|
(ert-deftest ibuffer-filter-inclusion-3 ()
|
|
"Tests inclusion with filename filters on specified buffers."
|
|
(require 'ibuf-ext)
|
|
(unwind-protect
|
|
(let* ((bufA
|
|
(funcall create-file-buffer "ibuf-test-3.a" :size 50
|
|
:mode #'text-mode
|
|
:include-content "...but a multitude of drops?\n"))
|
|
(bufB
|
|
(funcall create-non-file-buffer "ibuf-test-3.b" :size 50
|
|
:mode #'text-mode
|
|
:include-content "...but a multitude of drops?\n"))
|
|
(dirA (regexp-quote (with-current-buffer bufA default-directory)))
|
|
(dirB (regexp-quote (with-current-buffer bufB default-directory))))
|
|
(should (ibuffer-included-in-filters-p
|
|
bufA '((basename . "ibuf-test-3"))))
|
|
(should (ibuffer-included-in-filters-p
|
|
bufA '((basename . "test-3\\.a"))))
|
|
(should (ibuffer-included-in-filters-p
|
|
bufA '((file-extension . "a"))))
|
|
(should (ibuffer-included-in-filters-p
|
|
bufA (list (cons 'directory dirA))))
|
|
(should-not (ibuffer-included-in-filters-p
|
|
bufB '((basename . "ibuf-test-3"))))
|
|
(should-not (ibuffer-included-in-filters-p
|
|
bufB '((file-extension . "b"))))
|
|
(should (ibuffer-included-in-filters-p
|
|
bufB (list (cons 'directory dirB))))
|
|
(should (ibuffer-included-in-filters-p
|
|
bufA '((name . "ibuf-test-3"))))
|
|
(should (ibuffer-included-in-filters-p
|
|
bufB '((name . "ibuf-test-3")))))
|
|
(funcall clean-up)))
|
|
|
|
(ert-deftest ibuffer-filter-inclusion-4 ()
|
|
"Tests inclusion with various filters on a single buffer."
|
|
(require 'ibuf-ext)
|
|
(unwind-protect
|
|
(let ((buf
|
|
(funcall create-file-buffer "ibuf-test-4"
|
|
:mode #'emacs-lisp-mode :suffix ".el"
|
|
:include-content "(message \"--%s--\" 'emacs-rocks)\n")))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((file-extension . "el"))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((derived-mode . prog-mode))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((used-mode . emacs-lisp-mode))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((mode . emacs-lisp-mode))))
|
|
(with-current-buffer buf (set-buffer-modified-p t))
|
|
(should (ibuffer-included-in-filters-p buf '((modified))))
|
|
(with-current-buffer buf (set-buffer-modified-p nil))
|
|
(should (ibuffer-included-in-filters-p buf '((not modified))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((and (file-extension . "el")
|
|
(derived-mode . prog-mode)
|
|
(not modified)))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((or (file-extension . "tex")
|
|
(derived-mode . prog-mode)
|
|
(modified)))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((file-extension . "el")
|
|
(derived-mode . prog-mode)
|
|
(not modified)))))
|
|
(funcall clean-up)))
|
|
|
|
(ert-deftest ibuffer-filter-inclusion-5 ()
|
|
"Tests inclusion with various filters on a single buffer."
|
|
(require 'ibuf-ext)
|
|
(unwind-protect
|
|
(let ((buf
|
|
(funcall create-non-file-buffer "ibuf-test-5.el"
|
|
:mode #'emacs-lisp-mode
|
|
:include-content
|
|
"(message \"--%s--\" \"It really does!\")\n")))
|
|
(should-not (ibuffer-included-in-filters-p
|
|
buf '((file-extension . "el"))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((size-gt . 18))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((predicate . (lambda ()
|
|
(> (- (point-max) (point-min)) 18))))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((and (mode . emacs-lisp-mode)
|
|
(or (starred-name)
|
|
(size-gt . 18))
|
|
(and (not (size-gt . 100))
|
|
(content . "[Ii]t *really does!")
|
|
(or (name . "test-5")
|
|
(not (filename . "test-5")))))))))
|
|
(funcall clean-up)))
|
|
|
|
(ert-deftest ibuffer-filter-inclusion-6 ()
|
|
"Tests inclusion using saved filters and DeMorgan's laws."
|
|
(require 'ibuf-ext)
|
|
(unwind-protect
|
|
(let ((buf
|
|
(funcall create-non-file-buffer "*ibuf-test-6*" :size 65
|
|
:mode #'text-mode))
|
|
(buf2
|
|
(funcall create-file-buffer "ibuf-test-6a" :suffix ".html"
|
|
:mode #'html-mode
|
|
:include-content
|
|
"<HTML><BODY><H1>Hello, World!</H1></BODY></HTML>")))
|
|
(should (ibuffer-included-in-filters-p buf '((starred-name))))
|
|
(should-not (ibuffer-included-in-filters-p
|
|
buf '((saved . "text document"))))
|
|
(should (ibuffer-included-in-filters-p buf2 '((saved . "web"))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf2 '((not (and (not (derived-mode . sgml-mode))
|
|
(not (derived-mode . css-mode))
|
|
(not (mode . javascript-mode))
|
|
(not (mode . js2-mode))
|
|
(not (mode . scss-mode))
|
|
(not (derived-mode . haml-mode))
|
|
(not (mode . sass-mode)))))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((and (starred-name)
|
|
(or (size-gt . 50) (filename . "foo"))))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((not (or (not starred-name)
|
|
(and (size-lt . 51)
|
|
(not (filename . "foo")))))))))
|
|
(funcall clean-up)))
|
|
|
|
(ert-deftest ibuffer-filter-inclusion-7 ()
|
|
"Tests inclusion with various filters on a single buffer."
|
|
(require 'ibuf-ext)
|
|
(unwind-protect
|
|
(let ((buf
|
|
(funcall create-non-file-buffer "ibuf-test-7"
|
|
:mode #'artist-mode)))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((not (starred-name)))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((not starred-name))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((not (not (not starred-name))))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((not (modified)))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((not modified))))
|
|
(should (ibuffer-included-in-filters-p
|
|
buf '((not (not (not modified)))))))
|
|
(funcall clean-up)))
|
|
|
|
(ert-deftest ibuffer-filter-inclusion-8 ()
|
|
"Tests inclusion with various filters."
|
|
(require 'ibuf-ext)
|
|
(unwind-protect
|
|
(let ((bufA
|
|
(funcall create-non-file-buffer "ibuf-test-8a"
|
|
:mode #'artist-mode))
|
|
(bufB (funcall create-non-file-buffer "*ibuf-test-8b*" :size 32))
|
|
(bufC (or (memq system-type '(ms-dos windows-nt))
|
|
(funcall create-file-buffer "ibuf-test8c" :suffix "*"
|
|
:size 64)))
|
|
(bufD (or (memq system-type '(ms-dos windows-nt))
|
|
(funcall create-file-buffer "*ibuf-test8d" :size 128)))
|
|
(bufE (or (memq system-type '(ms-dos windows-nt))
|
|
(funcall create-file-buffer "*ibuf-test8e"
|
|
:suffix "*<2>" :size 16)))
|
|
(bufF (and (funcall create-non-file-buffer "*ibuf-test8f*")
|
|
(funcall create-non-file-buffer "*ibuf-test8f*"
|
|
:size 8))))
|
|
(with-current-buffer bufA (set-buffer-modified-p t))
|
|
(should (ibuffer-included-in-filters-p
|
|
bufA '((and (not starred-name)
|
|
(modified)
|
|
(name . "test-8")
|
|
(not (size-gt . 100))
|
|
(mode . picture-mode)))))
|
|
(with-current-buffer bufA (set-buffer-modified-p nil))
|
|
(should-not (ibuffer-included-in-filters-p
|
|
bufA '((or (starred-name) (visiting-file) (modified)))))
|
|
(should (ibuffer-included-in-filters-p
|
|
bufB '((and (starred-name)
|
|
(name . "test.*8b")
|
|
(size-gt . 31)
|
|
(not visiting-file)))))
|
|
;; MS-DOS and MS-Windows don't allow "*" in file names.
|
|
(or (memq system-type '(ms-dos windows-nt))
|
|
(should (ibuffer-included-in-filters-p
|
|
bufC '((and (not (starred-name))
|
|
(visiting-file)
|
|
(name . "8c[^*]*\\*")
|
|
(size-lt . 65))))))
|
|
;; MS-DOS and MS-Windows don't allow "*" in file names.
|
|
(or (memq system-type '(ms-dos windows-nt))
|
|
(should (ibuffer-included-in-filters-p
|
|
bufD '((and (not (starred-name))
|
|
(visiting-file)
|
|
(name . "\\`\\*.*test8d")
|
|
(size-lt . 129)
|
|
(size-gt . 127))))))
|
|
;; MS-DOS and MS-Windows don't allow "*" in file names.
|
|
(or (memq system-type '(ms-dos windows-nt))
|
|
(should (ibuffer-included-in-filters-p
|
|
bufE '((and (starred-name)
|
|
(visiting-file)
|
|
(name . "8e.*?\\*<[[:digit:]]+>")
|
|
(size-gt . 10))))))
|
|
(should (ibuffer-included-in-filters-p
|
|
bufF '((and (starred-name)
|
|
(not (visiting-file))
|
|
(name . "8f\\*<[[:digit:]]>")
|
|
(size-lt . 10))))))
|
|
(funcall clean-up))))
|
|
|
|
;; Test Filter Combination and Decomposition
|
|
(let* (ibuffer-to-kill ; if non-nil, kill this buffer at cleanup
|
|
(ibuffer-already 'check) ; existing ibuffer buffer to use but not kill
|
|
;; Utility functions without polluting the environment
|
|
(get-test-ibuffer
|
|
(lambda ()
|
|
"Returns a test ibuffer-mode buffer, creating one if necessary.
|
|
If a new buffer is created, it is named \"*Test-Ibuffer*\" and is
|
|
saved to `ibuffer-to-kill' for later cleanup."
|
|
(when (eq ibuffer-already 'check)
|
|
(setq ibuffer-already
|
|
(catch 'found-buf
|
|
(dolist (buf (buffer-list) nil)
|
|
(when (with-current-buffer buf
|
|
(derived-mode-p 'ibuffer-mode))
|
|
(throw 'found-buf buf))))))
|
|
(or ibuffer-already
|
|
ibuffer-to-kill
|
|
(let ((test-ibuf-name "*Test-Ibuffer*"))
|
|
(ibuffer nil test-ibuf-name nil t)
|
|
(setq ibuffer-to-kill (get-buffer test-ibuf-name))))))
|
|
(clean-up
|
|
(lambda ()
|
|
"Restore all emacs state modified during the tests"
|
|
(when ibuffer-to-kill ; created ibuffer
|
|
(with-current-buffer ibuffer-to-kill
|
|
(set-buffer-modified-p nil)
|
|
(bury-buffer))
|
|
(kill-buffer ibuffer-to-kill)
|
|
(setq ibuffer-to-kill nil))
|
|
(when (and ibuffer-already (not (eq ibuffer-already 'check)))
|
|
;; restore existing ibuffer state
|
|
(ibuffer-update nil t)))))
|
|
;; Tests
|
|
(ert-deftest ibuffer-decompose-filter ()
|
|
"Tests `ibuffer-decompose-filter' for and, or, not, and saved."
|
|
(require 'ibuf-ext)
|
|
(unwind-protect
|
|
(let ((ibuf (funcall get-test-ibuffer)))
|
|
(with-current-buffer ibuf
|
|
(let ((ibuffer-filtering-qualifiers nil)
|
|
(ibuffer-filter-groups nil)
|
|
(filters '((size-gt . 100) (not (starred-name))
|
|
(name . "foo"))))
|
|
(progn
|
|
(push (cons 'or filters) ibuffer-filtering-qualifiers)
|
|
(ibuffer-decompose-filter)
|
|
(should (equal filters ibuffer-filtering-qualifiers))
|
|
(setq ibuffer-filtering-qualifiers nil))
|
|
(progn
|
|
(push (cons 'and filters) ibuffer-filtering-qualifiers)
|
|
(ibuffer-decompose-filter)
|
|
(should (equal filters ibuffer-filtering-qualifiers))
|
|
(setq ibuffer-filtering-qualifiers nil))
|
|
(progn
|
|
(push (list 'not (car filters)) ibuffer-filtering-qualifiers)
|
|
(ibuffer-decompose-filter)
|
|
(should (equal (list (car filters))
|
|
ibuffer-filtering-qualifiers))
|
|
(setq ibuffer-filtering-qualifiers nil))
|
|
(progn
|
|
(push (cons 'not (car filters)) ibuffer-filtering-qualifiers)
|
|
(ibuffer-decompose-filter)
|
|
(should (equal (list (car filters))
|
|
ibuffer-filtering-qualifiers))
|
|
(setq ibuffer-filtering-qualifiers nil))
|
|
(let ((gnus (assoc "gnus" ibuffer-saved-filters)))
|
|
(push '(saved . "gnus") ibuffer-filtering-qualifiers)
|
|
(ibuffer-decompose-filter)
|
|
(should (equal (cdr gnus) ibuffer-filtering-qualifiers))
|
|
(ibuffer-decompose-filter)
|
|
(should (equal (cdr (cadr gnus)) ibuffer-filtering-qualifiers))
|
|
(setq ibuffer-filtering-qualifiers nil))
|
|
(when (not (assoc "__unknown__" ibuffer-saved-filters))
|
|
(push '(saved . "__uknown__") ibuffer-filtering-qualifiers)
|
|
(should-error (ibuffer-decompose-filter) :type 'error)
|
|
(setq ibuffer-filtering-qualifiers nil))
|
|
(progn
|
|
(push (car filters) ibuffer-filtering-qualifiers)
|
|
(should-error (ibuffer-decompose-filter) :type 'error)
|
|
(setq ibuffer-filtering-qualifiers nil)))))
|
|
(funcall clean-up)))
|
|
|
|
(ert-deftest ibuffer-and-filter ()
|
|
"Tests `ibuffer-and-filter' in an Ibuffer buffer."
|
|
(require 'ibuf-ext)
|
|
(unwind-protect
|
|
(let ((ibuf (funcall get-test-ibuffer)))
|
|
(with-current-buffer ibuf
|
|
(let ((ibuffer-filtering-qualifiers nil)
|
|
(ibuffer-filter-groups nil)
|
|
(filters [(size-gt . 100) (not (starred-name))
|
|
(filename . "A") (mode . text-mode)]))
|
|
(should-error (ibuffer-and-filter) :type 'error)
|
|
(progn
|
|
(push (aref filters 1) ibuffer-filtering-qualifiers)
|
|
(should-error (ibuffer-and-filter) :type 'error))
|
|
(should (progn
|
|
(push (aref filters 0) ibuffer-filtering-qualifiers)
|
|
(ibuffer-and-filter)
|
|
(and (equal (list 'and (aref filters 0) (aref filters 1))
|
|
(car ibuffer-filtering-qualifiers))
|
|
(null (cdr ibuffer-filtering-qualifiers)))))
|
|
(should (progn
|
|
(ibuffer-and-filter 'decompose)
|
|
(and (equal (aref filters 0)
|
|
(pop ibuffer-filtering-qualifiers))
|
|
(equal (aref filters 1)
|
|
(pop ibuffer-filtering-qualifiers))
|
|
(null ibuffer-filtering-qualifiers))))
|
|
(should (progn
|
|
(push (list 'and (aref filters 2) (aref filters 3))
|
|
ibuffer-filtering-qualifiers)
|
|
(push (list 'and (aref filters 0) (aref filters 1))
|
|
ibuffer-filtering-qualifiers)
|
|
(ibuffer-and-filter)
|
|
(and (equal (list 'and (aref filters 0) (aref filters 1)
|
|
(aref filters 2) (aref filters 3))
|
|
(car ibuffer-filtering-qualifiers))
|
|
(null (cdr ibuffer-filtering-qualifiers)))))
|
|
(pop ibuffer-filtering-qualifiers)
|
|
(should (progn
|
|
(push (list 'or (aref filters 2) (aref filters 3))
|
|
ibuffer-filtering-qualifiers)
|
|
(push (list 'and (aref filters 0) (aref filters 1))
|
|
ibuffer-filtering-qualifiers)
|
|
(ibuffer-and-filter)
|
|
(and (equal (list 'and (aref filters 0) (aref filters 1)
|
|
(list 'or (aref filters 2)
|
|
(aref filters 3)))
|
|
(car ibuffer-filtering-qualifiers))
|
|
(null (cdr ibuffer-filtering-qualifiers)))))
|
|
(pop ibuffer-filtering-qualifiers)
|
|
(should (progn
|
|
(push (list 'and (aref filters 2) (aref filters 3))
|
|
ibuffer-filtering-qualifiers)
|
|
(push (list 'or (aref filters 0) (aref filters 1))
|
|
ibuffer-filtering-qualifiers)
|
|
(ibuffer-and-filter)
|
|
(and (equal (list 'and (list 'or (aref filters 0)
|
|
(aref filters 1))
|
|
(aref filters 2) (aref filters 3))
|
|
(car ibuffer-filtering-qualifiers))
|
|
(null (cdr ibuffer-filtering-qualifiers)))))
|
|
(pop ibuffer-filtering-qualifiers)
|
|
(should (progn
|
|
(push (list 'or (aref filters 2) (aref filters 3))
|
|
ibuffer-filtering-qualifiers)
|
|
(push (list 'or (aref filters 0) (aref filters 1))
|
|
ibuffer-filtering-qualifiers)
|
|
(ibuffer-and-filter)
|
|
(and (equal (list 'and
|
|
(list 'or (aref filters 0)
|
|
(aref filters 1))
|
|
(list 'or (aref filters 2)
|
|
(aref filters 3)))
|
|
(car ibuffer-filtering-qualifiers))
|
|
(null (cdr ibuffer-filtering-qualifiers))))))))
|
|
(funcall clean-up)))
|
|
|
|
(ert-deftest ibuffer-or-filter ()
|
|
"Tests `ibuffer-or-filter' in an Ibuffer buffer."
|
|
(require 'ibuf-ext)
|
|
(unwind-protect
|
|
(let ((ibuf (funcall get-test-ibuffer)))
|
|
(with-current-buffer ibuf
|
|
(let ((ibuffer-filtering-qualifiers nil)
|
|
(ibuffer-filter-groups nil)
|
|
(filters [(size-gt . 100) (not (starred-name))
|
|
(filename . "A") (mode . text-mode)]))
|
|
(should-error (ibuffer-or-filter) :type 'error)
|
|
(progn
|
|
(push (aref filters 1) ibuffer-filtering-qualifiers)
|
|
(should-error (ibuffer-or-filter) :type 'error))
|
|
(should (progn
|
|
(push (aref filters 0) ibuffer-filtering-qualifiers)
|
|
(ibuffer-or-filter)
|
|
(and (equal (list 'or (aref filters 0) (aref filters 1))
|
|
(car ibuffer-filtering-qualifiers))
|
|
(null (cdr ibuffer-filtering-qualifiers)))))
|
|
(should (progn
|
|
(ibuffer-or-filter 'decompose)
|
|
(and (equal (aref filters 0)
|
|
(pop ibuffer-filtering-qualifiers))
|
|
(equal (aref filters 1)
|
|
(pop ibuffer-filtering-qualifiers))
|
|
(null ibuffer-filtering-qualifiers))))
|
|
(should (progn
|
|
(push (list 'or (aref filters 2) (aref filters 3))
|
|
ibuffer-filtering-qualifiers)
|
|
(push (list 'or (aref filters 0) (aref filters 1))
|
|
ibuffer-filtering-qualifiers)
|
|
(ibuffer-or-filter)
|
|
(and (equal (list 'or (aref filters 0) (aref filters 1)
|
|
(aref filters 2) (aref filters 3))
|
|
(car ibuffer-filtering-qualifiers))
|
|
(null (cdr ibuffer-filtering-qualifiers)))))
|
|
(pop ibuffer-filtering-qualifiers)
|
|
(should (progn
|
|
(push (list 'and (aref filters 2) (aref filters 3))
|
|
ibuffer-filtering-qualifiers)
|
|
(push (list 'or (aref filters 0) (aref filters 1))
|
|
ibuffer-filtering-qualifiers)
|
|
(ibuffer-or-filter)
|
|
(and (equal (list 'or (aref filters 0) (aref filters 1)
|
|
(list 'and (aref filters 2)
|
|
(aref filters 3)))
|
|
(car ibuffer-filtering-qualifiers))
|
|
(null (cdr ibuffer-filtering-qualifiers)))))
|
|
(pop ibuffer-filtering-qualifiers)
|
|
(should (progn
|
|
(push (list 'or (aref filters 2) (aref filters 3))
|
|
ibuffer-filtering-qualifiers)
|
|
(push (list 'and (aref filters 0) (aref filters 1))
|
|
ibuffer-filtering-qualifiers)
|
|
(ibuffer-or-filter)
|
|
(and (equal (list 'or (list 'and (aref filters 0)
|
|
(aref filters 1))
|
|
(aref filters 2) (aref filters 3))
|
|
(car ibuffer-filtering-qualifiers))
|
|
(null (cdr ibuffer-filtering-qualifiers)))))
|
|
(pop ibuffer-filtering-qualifiers)
|
|
(should (progn
|
|
(push (list 'and (aref filters 2) (aref filters 3))
|
|
ibuffer-filtering-qualifiers)
|
|
(push (list 'and (aref filters 0) (aref filters 1))
|
|
ibuffer-filtering-qualifiers)
|
|
(ibuffer-or-filter)
|
|
(and (equal (list 'or
|
|
(list 'and (aref filters 0)
|
|
(aref filters 1))
|
|
(list 'and (aref filters 2)
|
|
(aref filters 3)))
|
|
(car ibuffer-filtering-qualifiers))
|
|
(null (cdr ibuffer-filtering-qualifiers))))))))
|
|
(funcall clean-up))))
|
|
|
|
(ert-deftest ibuffer-format-qualifier ()
|
|
"Tests string recommendation of filter from `ibuffer-format-qualifier'."
|
|
(require 'ibuf-ext)
|
|
(let ((test1 '(mode . org-mode))
|
|
(test2 '(size-lt . 100))
|
|
(test3 '(derived-mode . prog-mode))
|
|
(test4 '(or (size-gt . 10000)
|
|
(and (not (starred-name))
|
|
(directory . "\\<org\\>"))))
|
|
(test5 '(or (filename . "scratch")
|
|
(filename . "bonz")
|
|
(filename . "temp")))
|
|
(test6 '(or (mode . emacs-lisp-mode) (file-extension . "elc?")
|
|
(and (starred-name) (name . "elisp"))
|
|
(mode . lisp-interaction-mode)))
|
|
(description (lambda (q)
|
|
(cadr (assq q ibuffer-filtering-alist))))
|
|
(tag (lambda (&rest args )
|
|
(concat " [" (apply #'concat args) "]"))))
|
|
(should (equal (ibuffer-format-qualifier test1)
|
|
(funcall tag (funcall description 'mode)
|
|
": " "org-mode")))
|
|
(should (equal (ibuffer-format-qualifier test2)
|
|
(funcall tag (funcall description 'size-lt)
|
|
": " "100")))
|
|
(should (equal (ibuffer-format-qualifier test3)
|
|
(funcall tag (funcall description 'derived-mode)
|
|
": " "prog-mode")))
|
|
(should (equal (ibuffer-format-qualifier test4)
|
|
(funcall tag "OR"
|
|
(funcall tag (funcall description 'size-gt)
|
|
": " (format "%s" 10000))
|
|
(funcall tag "AND"
|
|
(funcall tag "NOT"
|
|
(funcall tag
|
|
(funcall description
|
|
'starred-name)
|
|
"" ""))
|
|
(funcall tag
|
|
(funcall description 'directory)
|
|
": " "\\<org\\>")))))
|
|
(should (equal (ibuffer-format-qualifier test5)
|
|
(funcall tag "OR"
|
|
(funcall tag (funcall description 'filename)
|
|
": " "scratch")
|
|
(funcall tag (funcall description 'filename)
|
|
": " "bonz")
|
|
(funcall tag (funcall description 'filename)
|
|
": " "temp"))))
|
|
(should (equal (ibuffer-format-qualifier test6)
|
|
(funcall tag "OR"
|
|
(funcall tag (funcall description 'mode)
|
|
": " "emacs-lisp-mode")
|
|
(funcall tag (funcall description 'file-extension)
|
|
": " "elc?")
|
|
(funcall tag "AND"
|
|
(funcall tag
|
|
(funcall description 'starred-name)
|
|
"" "")
|
|
(funcall tag
|
|
(funcall description 'name)
|
|
": " "elisp"))
|
|
(funcall tag (funcall description 'mode)
|
|
": " "lisp-interaction-mode"))))))
|
|
|
|
(ert-deftest ibuffer-unary-operand ()
|
|
"Tests `ibuffer-unary-operand': (not cell) or (not . cell) -> cell."
|
|
(require 'ibuf-ext)
|
|
(should (equal (ibuffer-unary-operand '(not . (mode "foo")))
|
|
'(mode "foo")))
|
|
(should (equal (ibuffer-unary-operand '(not (mode "foo")))
|
|
'(mode "foo")))
|
|
(should (equal (ibuffer-unary-operand '(not "cdr"))
|
|
'("cdr")))
|
|
(should (equal (ibuffer-unary-operand '(not)) nil))
|
|
(should (equal (ibuffer-unary-operand '(not . a)) 'a)))
|
|
|
|
(provide 'ibuffer-tests)
|
|
;;; ibuffer-tests.el ends here
|