Mercurial > hg > xemacs-beta
changeset 5823:efb76d6d0c1d
Trivial merge
| author | Stephen J. Turnbull <stephen@xemacs.org> |
|---|---|
| date | Mon, 20 Oct 2014 16:35:18 +0900 |
| parents | b3824b7f5627 (current diff) 21b5725c6a45 (diff) |
| children | 6928877dbc26 |
| files | |
| diffstat | 2 files changed, 87 insertions(+), 44 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/ChangeLog Sat Oct 18 21:48:10 2014 +0100 +++ b/tests/ChangeLog Mon Oct 20 16:35:18 2014 +0900 @@ -1,3 +1,14 @@ +2014-10-11 Stephen J. Turnbull <stephen@xemacs.org> + + * automated/keymap-tests.el: + Reformat loops for readability and maintainability. + +2014-10-11 Stephen J. Turnbull <stephen@xemacs.org> + + * automated/keymap-tests.el: + Avoid commands defined in packages in some tests. + Packages may not be available at make check time. + 2014-07-14 Aidan Kehoe <kehoea@parhasard.net> * automated/extent-tests.el:
--- a/tests/automated/keymap-tests.el Sat Oct 18 21:48:10 2014 +0100 +++ b/tests/automated/keymap-tests.el Mon Oct 20 16:35:18 2014 +0900 @@ -27,43 +27,75 @@ (help-map-copy t) (minor-mode-map-alist (acons 'help-map-copy map minor-mode-map-alist))) (set-keymap-parent map parent-map) - (loop for (keys def) on '((shift tab) help-prev-symbol tab - help-next-symbol c customize-variable V - find-variable-at-point q - help-mode-quit f find-function-at-point d - describe-function-at-point v - describe-variable-at-point i Info-elisp-ref F - find-function-at-point Q help-mode-bury button2 - help-mouse-find-source-or-track p - help-prev-section n help-next-section return - help-activate-function-or-scroll-up) + ;; Take care in choosing commands for these tests! Many of the commands + ;; here are defined in packages, which may not be available to make check. + (loop for (keys def) on '((shift tab) help-prev-symbol + tab help-next-symbol + c customize-variable + V find-variable-at-point + q help-mode-quit + f find-function-at-point + d describe-function-at-point + D describe-function-at-point + v describe-variable-at-point + i Info-elisp-ref + F find-function-at-point + Q help-mode-bury + button2 help-mouse-find-source-or-track + p help-prev-section + n help-next-section + return help-activate-function-or-scroll-up) by #'cddr do (define-key map (vector keys) def)) - (loop for (keys def) on '(u view-scroll-some-lines-down % view-goto-percent - \2 digit-argument p view-goto-percent \? - view-search-backward - negative-argument k - view-scroll-lines-down backspace scroll-down G - view-last-windowful f scroll-up \5 - digit-argument s view-repeat-search \0 - digit-argument n view-repeat-search = what-line - \\ view-search-backward delete scroll-down \8 - digit-argument E view-file d - view-scroll-some-lines-up \3 digit-argument q - view-quit ! shell-command (control j) - view-scroll-lines-up (control m) - view-scroll-lines-up y view-scroll-lines-down - linefeed view-scroll-lines-up g view-goto-line - \6 digit-argument t toggle-truncate-lines C - view-cleanup-backspaces b scroll-down \1 - digit-argument P view-buffer return - view-scroll-lines-up | shell-command-on-region j - view-scroll-lines-up \9 digit-argument \' - register-to-point e view-scroll-lines-up \4 - digit-argument r recenter space scroll-up / - view-search-forward N view-buffer m - point-to-register h view-mode-describe \7 - digit-argument - find-function-at-point view-mode-describe) + (loop for (keys def) on '(u view-scroll-some-lines-down + % view-goto-percent + \2 digit-argument + p view-goto-percent + \? view-search-backward + - negative-argument + k view-scroll-lines-down + backspace scroll-down + G view-last-windowful + f scroll-up + \5 digit-argument + s view-repeat-search + \0 digit-argument + n view-repeat-search + = what-line + \\ view-search-backward + delete scroll-down + \8 digit-argument + E view-file + d view-scroll-some-lines-up + \3 digit-argument + q view-quit + ! shell-command + (control j) view-scroll-lines-up + (control m) view-scroll-lines-up + y view-scroll-lines-down + linefeed view-scroll-lines-up + g view-goto-line + \6 digit-argument + t toggle-truncate-lines + C view-cleanup-backspaces + b scroll-down + \1 digit-argument + P view-buffer + return view-scroll-lines-up + | shell-command-on-region + j view-scroll-lines-up + \9 digit-argument + \' register-to-point + e view-scroll-lines-up + \4 digit-argument + r recenter + space scroll-up + / view-search-forward + N view-buffer + m point-to-register + h view-mode-describe + \7 digit-argument + describe-function-at-point view-mode-describe) by #'cddr do (define-key parent-map (vector keys) def)) (Assert (eq (key-binding [F]) 'find-function-at-point) @@ -74,31 +106,31 @@ "checking normal key parent lookup works, \\2") (Assert (eq (key-binding [|]) 'shell-command-on-region) "checking normal key parent lookup works, |") - (define-key map [remap find-function-at-point] #'find-file) - (Assert (eq (key-binding [F]) 'find-file) - "checking remapped key lookup works, F") - (Assert (eq (key-binding [f]) 'find-file) + (define-key map [remap describe-function-at-point] #'find-file) + (Assert (eq (key-binding [D]) 'find-file) + "checking remapped key lookup works, d") + (Assert (eq (key-binding [d]) 'find-file) "checking remapped key lookup works, f") (Assert (eq (key-binding [\2]) 'digit-argument) "checking normal key parent lookup works, \\2") (Assert (eq (key-binding [|]) 'shell-command-on-region) "checking normal key parent lookup works, |") - (Assert (eq (key-binding [find-function-at-point]) 'view-mode-describe) + (Assert (eq (key-binding [describe-function-at-point]) 'view-mode-describe) "checking remapped function doesn't affect key name mapping") (define-key parent-map [remap help-next-symbol] #'find-file) (Assert (eq (key-binding [tab]) 'find-file) "checking remapping in parent extends to child") (Assert (equal (commands-remapped-to 'find-file) - '(help-next-symbol find-function-at-point)) + '(help-next-symbol describe-function-at-point)) "checking #'commands-remapped-to is sane") (Check-Error wrong-type-argument (commands-remapped-to pi)) (Check-Error wrong-type-argument (commands-remapped-to 'find-file pi)) (Check-Error wrong-type-argument (commands-remapped-to 'find-file nil pi)) - (Assert (eq (command-remapping 'find-function-at-point) 'find-file) + (Assert (eq (command-remapping 'describe-function-at-point) 'find-file) "checking #'command-remapping is sane") (Check-Error wrong-type-argument (command-remapping pi)) - (Check-Error wrong-type-argument (command-remapping 'find-function-at-point + (Check-Error wrong-type-argument (command-remapping 'describe-function-at-point pi)) - (Check-Error wrong-type-argument (command-remapping 'find-function-at-point + (Check-Error wrong-type-argument (command-remapping 'describe-function-at-point nil pi)))