mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-23 14:10:28 -08:00
* 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.
413 lines
18 KiB
EmacsLisp
413 lines
18 KiB
EmacsLisp
;;; erc-tests-common.el --- Common helpers for ERC tests -*- lexical-binding: t -*-
|
|
|
|
;; Copyright (C) 2023-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/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;; This file must *not* contain any `ert-deftest' definitions. See
|
|
;; top of test/lisp/erc/erc-tests.el for loading example.
|
|
;;
|
|
;; Environment variables:
|
|
;;
|
|
;; `ERC_PACKAGE_NAME': Name of the installed ERC package currently
|
|
;; running. ERC needs this in order to load the same package in
|
|
;; tests that run in a subprocess. Necessary even when the package
|
|
;; name is `erc' and not something like `erc-49860'.
|
|
;;
|
|
;; `ERC_TESTS_INIT': The name of an alternate init file. Mainly for
|
|
;; integrations tests involving starter kits.
|
|
;;
|
|
;; `ERC_TESTS_SNAPSHOT_SAVE': When set, ERC saves the current test's
|
|
;; snapshots to disk.
|
|
;;
|
|
|
|
;;; Code:
|
|
(require 'ert-x)
|
|
(require 'erc)
|
|
(eval-when-compile (require 'erc-stamp))
|
|
(eval-and-compile
|
|
(let ((load-path (cons (expand-file-name "../erc-d" (ert-resource-directory))
|
|
load-path)))
|
|
(require 'erc-d-i)))
|
|
|
|
(defmacro erc-tests-common-equal-with-props (a b)
|
|
"Compare strings A and B for equality including text props.
|
|
Use `ert-equal-including-properties' on older Emacsen."
|
|
(list (if (< emacs-major-version 29)
|
|
'ert-equal-including-properties
|
|
'equal-including-properties)
|
|
a b))
|
|
|
|
;; Caller should probably shadow `erc-insert-modify-hook' or populate
|
|
;; user tables for erc-button.
|
|
;; FIXME explain this comment ^ in more detail or delete.
|
|
(defun erc-tests-common-prep-for-insertion ()
|
|
"Initialize current buffer with essentials for message insertion.
|
|
Assume caller intends to use `erc-display-message'."
|
|
(erc-mode)
|
|
(erc--initialize-markers (point) nil)
|
|
(should (= (point) erc-input-marker)))
|
|
|
|
(defun erc-tests-common-init-server-proc (&rest args)
|
|
"Create a process with `start-process' from ARGS.
|
|
Assign the result to `erc-server-process' in the current buffer."
|
|
(setq erc-server-process
|
|
(apply #'start-process (car args) (current-buffer) args))
|
|
(set-process-query-on-exit-flag erc-server-process nil)
|
|
erc-server-process)
|
|
|
|
;; After dropping support for Emacs 27, callers can use
|
|
;; `get-buffer-create' with INHIBIT-BUFFER-HOOKS.
|
|
(defun erc-tests-common-kill-buffers (&rest extra-buffers)
|
|
"Kill all ERC buffers and possibly EXTRA-BUFFERS."
|
|
(let (erc-kill-channel-hook erc-kill-server-hook erc-kill-buffer-hook)
|
|
(dolist (buf (erc-buffer-list))
|
|
(kill-buffer buf))
|
|
(named-let doit ((buffers extra-buffers))
|
|
(dolist (buf buffers)
|
|
(if (consp buf) (doit buf) (kill-buffer buf))))))
|
|
|
|
(defun erc-tests-common-with-process-input-spy (test-fn)
|
|
"Mock `erc-process-input-line' and call TEST-FN.
|
|
Shadow `erc--input-review-functions' and `erc-pre-send-functions'
|
|
with `erc-add-to-input-ring' removed. Shadow other relevant
|
|
variables as nil, and bind `erc-last-input-time' to 0. Also mock
|
|
`erc-server-buffer' to return the current buffer. Call TEST-FN
|
|
with a utility function that returns the set of arguments most
|
|
recently passed to the mocked `erc-process-input-line'. Make
|
|
`inhibit-message' non-nil unless running interactively."
|
|
(with-current-buffer (get-buffer-create "FakeNet")
|
|
(let* ((erc--input-review-functions
|
|
(remove 'erc-add-to-input-ring erc--input-review-functions))
|
|
(erc-pre-send-functions
|
|
(remove 'erc-add-to-input-ring erc-pre-send-functions)) ; for now
|
|
(inhibit-message noninteractive)
|
|
(erc-server-current-nick "tester")
|
|
(erc-last-input-time 0)
|
|
erc-accidental-paste-threshold-seconds
|
|
erc-send-modify-hook
|
|
;;
|
|
calls)
|
|
(cl-letf (((symbol-function 'erc-process-input-line)
|
|
(lambda (&rest r) (push r calls)))
|
|
((symbol-function 'erc-server-buffer)
|
|
(lambda () (current-buffer))))
|
|
(funcall test-fn (lambda () (pop calls)))))
|
|
(when noninteractive (kill-buffer))))
|
|
|
|
(defun erc-tests-common-make-server-buf (&optional name)
|
|
"Return a server buffer named NAME, creating it if necessary.
|
|
Use NAME for the network and the session server as well."
|
|
(with-current-buffer (if name
|
|
(get-buffer-create name)
|
|
(and (string-search "temp" (buffer-name))
|
|
(setq name "foonet")
|
|
(buffer-name)))
|
|
(erc-tests-common-prep-for-insertion)
|
|
(erc-tests-common-init-server-proc "sleep" "1")
|
|
(setq erc-session-server (concat "irc." name ".org")
|
|
erc-server-announced-name (concat "west." name ".org")
|
|
erc-server-users (make-hash-table :test #'equal)
|
|
erc-server-parameters nil
|
|
erc--isupport-params (make-hash-table)
|
|
erc-session-port 6667
|
|
erc-network (intern name)
|
|
erc-networks--id (erc-networks--id-create name))
|
|
(current-buffer)))
|
|
|
|
(defun erc-tests-common-string-to-propertized-parts (string)
|
|
"Return a sequence of `propertize' forms for generating STRING.
|
|
Expect maintainers manipulating template catalogs to use this
|
|
with `pp-eval-last-sexp' or similar to convert back and forth
|
|
between literal strings."
|
|
`(concat
|
|
,@(mapcar
|
|
(pcase-lambda (`(,beg ,end ,plist))
|
|
;; At the time of writing, `propertize' produces a string
|
|
;; with the order of the input plist reversed.
|
|
`(propertize ,(substring-no-properties string beg end)
|
|
,@(let (out)
|
|
(while-let ((plist)
|
|
(k (pop plist))
|
|
(v (pop plist)))
|
|
(push (if (or (consp v) (symbolp v)) `',v v) out)
|
|
(push `',k out))
|
|
out)))
|
|
(object-intervals string))))
|
|
|
|
(defun erc-tests-common-pp-propertized-parts (arg)
|
|
"Convert literal string before point into a `propertize'd form.
|
|
For simplicity, assume string evaluates to itself."
|
|
(interactive "P")
|
|
(let ((sexp (erc-tests-common-string-to-propertized-parts (pp-last-sexp))))
|
|
(if arg (insert (pp-to-string sexp)) (pp-macroexpand-expression sexp))))
|
|
|
|
|
|
(cl-defun erc-tests-common-add-cmem
|
|
(nick &optional (host "fsf.org")
|
|
(user (concat "~" (substring nick 0 (min 10 (length nick)))))
|
|
(full-name (upcase-initials nick)))
|
|
"Create channel user for NICK with test-oriented defaults."
|
|
(erc-update-channel-member (erc-target) nick nick t nil nil nil nil nil
|
|
host user full-name))
|
|
|
|
(defun erc-tests-common-parse-line (line)
|
|
"Return a single `erc-response' parsed from line."
|
|
(let ((parsed (erc-d-i--parse-message line)))
|
|
(make-erc-response :unparsed (erc-d-i-message.unparsed parsed)
|
|
:sender (erc-d-i-message.sender parsed)
|
|
:command (erc-d-i-message.command parsed)
|
|
:command-args (erc-d-i-message.command-args parsed)
|
|
:contents (erc-d-i-message.contents parsed)
|
|
:tags (erc-d-i-message.tags parsed))))
|
|
|
|
(defun erc-tests-common-simulate-line (line)
|
|
"Run response handlers for raw IRC protocol LINE."
|
|
(let ((parsed (erc-tests-common-parse-line line))
|
|
(erc--msg-prop-overrides (or erc--msg-prop-overrides
|
|
'((erc--ts . 0)))))
|
|
(erc-call-hooks erc-server-process parsed)))
|
|
|
|
(defun erc-tests-common-simulate-privmsg (nick msg)
|
|
(erc-tests-common-simulate-line
|
|
(format ":%s PRIVMSG %s :%s"
|
|
(erc-user-spec (erc-get-server-user nick))
|
|
(erc-target)
|
|
msg)))
|
|
|
|
;; The following utilities are meant to help prepare tests for
|
|
;; `erc--get-inserted-msg-bounds' and friends.
|
|
(defun erc-tests-common-get-inserted-msg-setup ()
|
|
(erc-tests-common-prep-for-insertion)
|
|
(let ((parsed (make-erc-response :unparsed ":bob PRIVMSG #chan :hi"
|
|
:sender "bob"
|
|
:command "PRIVMSG"
|
|
:command-args (list "#chan" "hi")
|
|
:contents "hi"))
|
|
(erc--msg-prop-overrides '((erc--ts . 0))))
|
|
(erc-display-message parsed nil (current-buffer)
|
|
(erc-format-privmessage "bob" "hi" nil t)))
|
|
(goto-char 3)
|
|
(should (looking-at "<bob> hi")))
|
|
|
|
;; All these bounds-finding functions take an optional POINT argument.
|
|
;; So run each case with and without it at each pos in the message.
|
|
(defun erc-tests-common-assert-get-inserted-msg (from to assert-fn)
|
|
(dolist (pt-arg '(nil t))
|
|
(dolist (i (number-sequence from to))
|
|
(goto-char i)
|
|
(ert-info ((format "At %d (%c) %s param" i (char-after i)
|
|
(if pt-arg "with" "")))
|
|
(funcall assert-fn (and pt-arg i))))))
|
|
|
|
(defun erc-tests-common-assert-get-inserted-msg/basic (test-fn)
|
|
(erc-tests-common-get-inserted-msg-setup)
|
|
(goto-char 11)
|
|
(should (looking-back "<bob> hi"))
|
|
(erc-tests-common-assert-get-inserted-msg 3 11 test-fn))
|
|
|
|
(defun erc-tests-common-assert-get-inserted-msg/truncated (test-fn)
|
|
(erc-tests-common-get-inserted-msg-setup)
|
|
(with-silent-modifications (delete-region 1 3))
|
|
(goto-char 9)
|
|
(should (looking-back "<bob> hi"))
|
|
(erc-tests-common-assert-get-inserted-msg 1 9 test-fn))
|
|
|
|
;; This is a "mixin" and requires a base assertion function, like
|
|
;; `erc-tests-common-assert-get-inserted-msg/basic', to work.
|
|
(defun erc-tests-common-assert-get-inserted-msg-readonly-with
|
|
(assert-fn test-fn)
|
|
(defvar erc-readonly-mode)
|
|
(defvar erc-readonly-mode-hook)
|
|
(let ((erc-readonly-mode nil)
|
|
(erc-readonly-mode-hook nil)
|
|
(erc-send-post-hook erc-send-post-hook)
|
|
(erc-insert-post-hook erc-insert-post-hook))
|
|
(erc-readonly-mode +1)
|
|
(funcall assert-fn test-fn)))
|
|
|
|
(defun erc-tests--common-display-message (orig &rest args)
|
|
(require 'erc-stamp)
|
|
(defvar erc-stamp--deferred-date-stamp)
|
|
(let (erc-stamp--deferred-date-stamp)
|
|
(prog1 (apply orig args)
|
|
(when-let* ((inst erc-stamp--deferred-date-stamp)
|
|
(fn (erc-stamp--date-fn inst)))
|
|
(funcall fn)))))
|
|
|
|
(defun erc-tests-common-display-message (&rest args)
|
|
(apply #'erc-tests--common-display-message #'erc-display-message args))
|
|
|
|
(defmacro erc-tests-common-with-date-aware-display-message (&rest body)
|
|
`(progn
|
|
(advice-add 'erc-display-message
|
|
:around #'erc-tests--common-display-message)
|
|
(unwind-protect (progn ,@body)
|
|
(advice-remove 'erc-display-message
|
|
#'erc-tests--common-display-message))))
|
|
|
|
;;;; Buffer snapshots
|
|
|
|
;; Use this variable to generate new snapshots after carefully
|
|
;; reviewing the output of *each* snapshot (not just first and last).
|
|
;; Obviously, only run one test at a time.
|
|
(defvar erc-tests-common-snapshot-save-p (getenv "ERC_TESTS_SNAPSHOT_SAVE"))
|
|
|
|
(defun erc-tests-common-snapshot-compare (name dir trans-fn buf-init-fn)
|
|
"Compare `buffer-string' to snapshot NAME.eld in DIR, if present.
|
|
When non-nil, run TRANS-FN to filter the current buffer string,
|
|
and expect a similar string in return. Call BUF-INIT-FN, when
|
|
non-nil, in the preview buffer after inserting the filtered
|
|
string."
|
|
(let* ((expect-file (file-name-with-extension (expand-file-name name dir)
|
|
"eld"))
|
|
(erc--own-property-names
|
|
(seq-difference `(font-lock-face ,@erc--own-property-names)
|
|
`(field display wrap-prefix line-prefix
|
|
erc--msg erc--cmd erc--spkr erc--ts erc--ctcp
|
|
erc--ephemeral)
|
|
#'eq))
|
|
(print-circle t)
|
|
(print-escape-newlines t)
|
|
(print-escape-nonascii t)
|
|
(got (erc--remove-text-properties
|
|
(buffer-substring (point-min) erc-insert-marker)))
|
|
(repr (funcall (or trans-fn #'identity) (prin1-to-string got)))
|
|
(xstr (read (with-temp-buffer
|
|
(insert-file-contents-literally expect-file)
|
|
(buffer-string)))))
|
|
(with-current-buffer (generate-new-buffer name)
|
|
(with-silent-modifications
|
|
(insert (setq got (read repr))))
|
|
(when buf-init-fn (funcall buf-init-fn))
|
|
(erc-mode))
|
|
(unless noninteractive
|
|
(with-current-buffer (generate-new-buffer (format "%s-xpt" name))
|
|
(insert xstr)
|
|
(erc-mode)))
|
|
;; LHS is a string, RHS is a symbol.
|
|
(if (string= erc-tests-common-snapshot-save-p
|
|
(ert-test-name (ert-running-test)))
|
|
(let (inhibit-message)
|
|
(with-temp-file expect-file
|
|
(insert repr))
|
|
;; Limit writing snapshots to one test at a time.
|
|
(message "erc-tests-common-snapshot-compare: wrote %S" expect-file))
|
|
(if (file-exists-p expect-file)
|
|
;; Ensure string-valued properties, like timestamps, aren't
|
|
;; recursive (signals `max-lisp-eval-depth' exceeded).
|
|
(named-let assert-equal
|
|
((latest (read repr))
|
|
(expect xstr))
|
|
(pcase latest
|
|
((or "" 'nil) t)
|
|
((pred stringp)
|
|
(should (equal-including-properties latest expect))
|
|
(let ((latest-intervals (object-intervals latest))
|
|
(expect-intervals (object-intervals expect)))
|
|
(while-let ((l-iv (pop latest-intervals))
|
|
(x-iv (pop expect-intervals))
|
|
(l-tab (map-into (nth 2 l-iv) 'hash-table))
|
|
(x-tab (map-into (nth 2 x-iv) 'hash-table)))
|
|
(pcase-dolist (`(,l-k . ,l-v) (map-pairs l-tab))
|
|
(assert-equal l-v (gethash l-k x-tab))
|
|
(remhash l-k x-tab))
|
|
(should (zerop (hash-table-count x-tab))))))
|
|
((pred sequencep)
|
|
(assert-equal (seq-first latest) (seq-first expect))
|
|
(assert-equal (seq-rest latest) (seq-rest expect)))
|
|
(_ (should (equal latest expect)))))
|
|
(message "Snapshot file missing: %S" expect-file)))))
|
|
|
|
(defun erc-tests-common-create-subprocess (code switches libs)
|
|
"Return subprocess for running CODE in an inferior Emacs.
|
|
Include SWITCHES, like \"-batch\", as well as libs, after
|
|
interspersing \"-l\" between members."
|
|
(let* ((package (if-let* ((found (getenv "ERC_PACKAGE_NAME"))
|
|
((string-prefix-p "erc-" found)))
|
|
(intern found)
|
|
'erc))
|
|
;; For integrations testing with managed configs that use a
|
|
;; different package manager.
|
|
(init (and-let* ((found (getenv "ERC_TESTS_INIT"))
|
|
(files (split-string found ",")))
|
|
(mapcan (lambda (f) (list "-l" f)) files)))
|
|
(prog
|
|
`(progn
|
|
,@(and (not init) (featurep 'compat)
|
|
`((require 'package)
|
|
(let ((package-load-list '((compat t) (,package t))))
|
|
(package-initialize))))
|
|
(require 'erc)
|
|
(cl-assert (equal erc-version ,erc-version) t)
|
|
,code))
|
|
(proc (apply #'start-process
|
|
(symbol-name (ert-test-name (ert-running-test)))
|
|
(current-buffer)
|
|
(concat invocation-directory invocation-name)
|
|
`(,@(or init '("-Q"))
|
|
,@switches
|
|
,@(mapcan (lambda (f) (list "-l" f)) libs)
|
|
"-eval" ,(format "%S" prog)))))
|
|
(set-process-query-on-exit-flag proc t)
|
|
proc))
|
|
|
|
(declare-function erc-track--setup "erc-track" ())
|
|
|
|
(defun erc-tests-common-track-modified-channels (test)
|
|
(erc-tests-common-prep-for-insertion)
|
|
(setq erc--target (erc--target-from-string "#chan"))
|
|
(erc-tests-common-track-modified-channels-sans-setup test))
|
|
|
|
(defun erc-tests-common-track-modified-channels-sans-setup (test)
|
|
"Provide a fixture for testing `erc-track-modified-channels'.
|
|
Call function TEST with another function that sets the mocked return
|
|
value of `erc-track--collect-faces-in' to the given argument, a list of
|
|
faces in the reverse order they appear in an inserted message."
|
|
(defvar erc-modified-channels-alist)
|
|
(defvar erc-modified-channels-object)
|
|
(defvar erc-track--attn-faces)
|
|
(defvar erc-track--normal-faces)
|
|
(defvar erc-track--priority-faces)
|
|
(defvar erc-track-faces-normal-list)
|
|
(defvar erc-track-faces-priority-list)
|
|
(defvar erc-track-mode)
|
|
|
|
(cl-letf* ((erc-track-mode t)
|
|
(erc-modified-channels-alist nil)
|
|
(erc-modified-channels-object erc-modified-channels-object)
|
|
(faces ())
|
|
((symbol-function 'force-mode-line-update) #'ignore)
|
|
((symbol-function 'erc-faces-in) (lambda (_) faces))
|
|
((symbol-function 'erc-track--collect-faces-in)
|
|
(lambda ()
|
|
(cons (map-into (mapcar (lambda (f) (cons f t)) faces)
|
|
'(hash-table :test equal))
|
|
faces))))
|
|
(erc-track--setup)
|
|
|
|
;; Faces from `erc-track--attn-faces' prepended.
|
|
(should (= (+ (length erc-track--attn-faces)
|
|
(length erc-track-faces-priority-list))
|
|
(hash-table-count erc-track--priority-faces)))
|
|
(should (= (length erc-track-faces-normal-list)
|
|
(hash-table-count erc-track--normal-faces)))
|
|
|
|
(funcall test (lambda (arg) (setq faces arg)))))
|
|
|
|
(provide 'erc-tests-common)
|