Mercurial > emacs
view test/redisplay-testsuite.el @ 110264:ec526909f60b
Migrate to Tramp 2.2. Rearrange load dependencies.
(Bug#1529, Bug#5448, Bug#5705)
* Makefile.in (TRAMP_DIR, TRAMP_SRC): New variables.
($(TRAMP_DIR)/tramp-loaddefs.el): New target.
(LOADDEFS): Add $(lisp)/net/tramp-loaddefs.el.
* net/tramp.el (top): Remove all other tramp-* loads except
tramp-compat.el. Remove all changes to tramp-unload-hook for
other tramp-* packages. Rearrange defun order. Change calls of
`tramp-compat-call-process', `tramp-compat-decimal-to-octal',
`tramp-compat-octal-to-decimal' to new function names.
(tramp-terminal-type, tramp-initial-end-of-output)
(tramp-methods, tramp-foreign-file-name-handler-alist)
(tramp-tramp-file-p, tramp-completion-mode-p)
(tramp-send-command-and-check, tramp-get-remote-path)
(tramp-get-remote-tmpdir, tramp-get-remote-ln)
(tramp-shell-quote-argument): Set tramp-autoload cookie.
(with-file-property, with-connection-property): Move to
tramp-cache.el.
(tramp-local-call-process, tramp-decimal-to-octal)
(tramp-octal-to-decimal): Move to tramp-compat.el.
(tramp-handle-shell-command): Do not require 'shell.
(tramp-compute-multi-hops): No special handling for tramp-gw-*
symbols.
(tramp-unload-tramp): Do not call `tramp-unload-file-name-handlers'.
* net/tramp-cache.el (top): Require 'tramp. Add to
`tramp-unload-hook'.
(tramp-cache-data, tramp-get-file-property)
(tramp-set-file-property, tramp-flush-file-property)
(tramp-flush-directory-property, tramp-get-connection-property)
(tramp-set-connection-property, tramp-flush-connection-property)
(tramp-cache-print, tramp-list-connections): Set tramp-autoload
cookie.
(with-file-property, with-connection-property): New defuns, moved
from tramp.el.
(tramp-flush-file-function): Use `with-parsed-tramp-file-name'
macro.
* net/tramp-cmds.el (top): Add to `tramp-unload-hook'.
(tramp-version): Set tramp-autoload cookie.
* net/tramp-compat.el (top): Require 'tramp-loaddefs. Remove all
changes to tramp-unload-hook for other tramp-* packages. Add to
`tramp-unload-hook'.
(tramp-compat-decimal-to-octal, tramp-compat-octal-to-decimal)
(tramp-compat-call-process): New defuns, moved from tramp.el.
* net/tramp-fish.el (top) Require just 'tramp. Add objects to
`tramp-methods' and `tramp-foreign-file-name-handler-alist'. Add
to `tramp-unload-hook'. Change call of
`tramp-compat-decimal-to-octal' to new function name.
(tramp-fish-method): Make it a defconst.
(tramp-fish-file-name-p): Make it a defsubst.
(tramp-fish-method, tramp-fish-file-name-handler)
(tramp-fish-file-name-p): Set tramp-autoload cookie.
* net/tramp-ftp.el (top) Add objects to `tramp-methods' and
`tramp-foreign-file-name-handler-alist'. Add to
`tramp-unload-hook'.
(tramp-ftp-method): Make it a defconst.
(tramp-ftp-file-name-p): Make it a defsubst.
(tramp-ftp-method, tramp-ftp-file-name-handler)
(tramp-ftp-file-name-p): Set tramp-autoload cookie.
* net/tramp-gvfs.el (top) Add objects to `tramp-methods' and
`tramp-foreign-file-name-handler-alist'. Add to
`tramp-unload-hook'. Change checks, whether package can be
loaded.
(tramp-gvfs-file-name-p): Make it a defsubst.
(tramp-gvfs-methods, tramp-gvfs-file-name-handler)
(tramp-gvfs-file-name-p): Set tramp-autoload cookie.
(tramp-gvfs-handle-file-directory-p): New defun.
(tramp-gvfs-file-name-handler-alist): Use it.
* net/tramp-gw.el (top) Add objects to `tramp-methods' and
`tramp-foreign-file-name-handler-alist'. Add to
`tramp-unload-hook'.
(tramp-gw-tunnel-method, tramp-gw-default-tunnel-port)
(tramp-gw-socks-method, tramp-gw-default-socks-port): Make it a
defconst.
(tramp-gw-tunnel-method, tramp-gw-socks-method)
(tramp-gw-open-connection): Set tramp-autoload cookie.
* net/tramp-imap.el (top) Require just 'tramp. Add objects to
`tramp-methods' and `tramp-foreign-file-name-handler-alist'. Add
to `tramp-unload-hook'. Change checks, whether package can be
loaded.
(tramp-imap-file-name-p): Make it a defsubst.
(tramp-imap-method, tramp-imaps-method)
(tramp-imap-file-name-handler)
(tramp-imap-file-name-p): Set tramp-autoload cookie.
* net/tramp-smb.el (top) Require just 'tramp. Add objects to
`tramp-methods' and `tramp-foreign-file-name-handler-alist'. Add
to `tramp-unload-hook'. Change checks, whether package can be
loaded. Change call of `tramp-compat-decimal-to-octal' to new
function name.
(tramp-smb-tunnel-method): Make it a defconst.
(tramp-smb-file-name-p): Make it a defsubst.
(tramp-smb-method, tramp-smb-file-name-handler)
(tramp-smb-file-name-p): Set tramp-autoload cookie.
* net/tramp-uu.el (top) Add to `tramp-unload-hook'.
(tramp-uuencode-region): Set tramp-autoload cookie.
* net/trampver.el (top) Add to `tramp-unload-hook'.
(tramp-version, tramp-bug-report-address): Set tramp-autoload
cookie. Update release number.
author | Michael Albinus <michael.albinus@gmx.de> |
---|---|
date | Wed, 08 Sep 2010 16:42:54 +0200 |
parents | b262a4f49bf3 |
children | 417b1e4d63cd |
line wrap: on
line source
;;; redisplay-testsuite.el --- Test suite for redisplay. ;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. ;; Author: Chong Yidong <cyd@stupidchicken.com> ;; Keywords: internal ;; Human-Keywords: internal ;; This file is part of GNU Emacs. ;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: ;; Type M-x test-redisplay RET to generate the test buffer. ;;; Code: (defun test-insert-overlay (text &rest props) (let ((opoint (point)) overlay) (insert text) (setq overlay (make-overlay opoint (point))) (while props (overlay-put overlay (car props) (cadr props)) (setq props (cddr props))))) (defun test-redisplay-1 () (insert "Test 1: Displaying adjacent and overlapping overlays:\n\n") (insert " Expected: gnu emacs\n") (insert " Results: ") (test-insert-overlay "n" 'before-string "g" 'after-string "u ") (test-insert-overlay "ma" 'before-string "e" 'after-string "cs") (insert "\n\n") (insert " Expected: gnu emacs\n") (insert " Results: ") (test-insert-overlay "u" 'before-string "gn") (test-insert-overlay "ma" 'before-string " e" 'after-string "cs") (insert "\n\n") (insert " Expected: gnu emacs\n") (insert " Results: ") (test-insert-overlay "XXX" 'display "u " 'before-string "gn" 'after-string "em") (test-insert-overlay "a" 'after-string "cs") (insert "\n\n") (insert " Expected: gnu emacs\n") (insert " Results: ") (test-insert-overlay "u " 'before-string "gn" 'after-string "em") (test-insert-overlay "XXX" 'display "a" 'after-string "cs") (insert "\n\n")) (defun test-redisplay-2 () (insert "Test 2: Mouse highlighting. Move your mouse over the letters XXX:\n\n") (insert " Expected: " (propertize "xxxXXXxxx" 'face 'highlight) "...---...\n Test: ") (test-insert-overlay "XXX" 'before-string "xxx" 'after-string "xxx" 'mouse-face 'highlight ) (test-insert-overlay "---" 'before-string "..." 'after-string "...") (insert "\n\n Expected: " (propertize "xxxXXX" 'face 'highlight) "...---...\n Test: ") (test-insert-overlay "XXX" 'before-string "xxx" 'mouse-face 'highlight) (test-insert-overlay "---" 'before-string "..." 'after-string "...") (insert "\n\n Expected: " (propertize "XXX" 'face 'highlight) "...---...\n Test: ") (test-insert-overlay "..." 'display "XXX" 'mouse-face 'highlight) (test-insert-overlay "---" 'before-string "..." 'after-string "...") (insert "\n\n Expected: " (propertize "XXXxxx" 'face 'highlight) "...\n Test: ") (test-insert-overlay "..." 'display "XXX" 'after-string "xxx" 'mouse-face 'highlight) (test-insert-overlay "error" 'display "...") (insert "\n\n Expected: " "---..." (propertize "xxxXXX" 'face 'highlight) "\n Test: ") (test-insert-overlay "xxx" 'display "---" 'after-string "...") (test-insert-overlay "error" 'before-string "xxx" 'display "XXX" 'mouse-face 'highlight) (insert "\n\n Expected: " "...---..." (propertize "xxxXXXxxx" 'face 'highlight) "\n Test: ") (test-insert-overlay "---" 'before-string "..." 'after-string "...") (test-insert-overlay "XXX" 'before-string "xxx" 'after-string "xxx" 'mouse-face 'highlight) (insert "\n\n Expected: " "..." (propertize "XXX" 'face 'highlight) "...\n Test: ") (test-insert-overlay "---" 'display (propertize "XXX" 'mouse-face 'highlight) 'before-string "..." 'after-string "...") (insert "\n\n Expected: " (propertize "XXX\n" 'face 'highlight) "\n Test: ") (test-insert-overlay "XXX\n" 'mouse-face 'highlight) (insert "\n\n")) (defun test-redisplay-3 () (insert "Test 3: Overlay with before/after strings and images:\n\n") (let ((img-data "#define x_width 8 #define x_height 8 static unsigned char x_bits[] = {0xff, 0x81, 0xbd, 0xa5, 0xa5, 0xbd, 0x81, 0xff };")) ;; Control (insert " Expected: AB" (propertize "X" 'display `(image :data ,img-data :type xbm)) "CD\n") ;; Overlay with before, after, and image display string. (insert " Result 1: ") (let ((opoint (point))) (insert "AXD\n") (let ((ov (make-overlay (1+ opoint) (+ 2 opoint)))) (overlay-put ov 'before-string "B") (overlay-put ov 'after-string "C") (overlay-put ov 'display `(image :data ,img-data :type xbm)))) ;; Overlay with before and after string, and image text prop. (insert " Result 2: ") (let ((opoint (point))) (insert "AXD\n") (let ((ov (make-overlay (1+ opoint) (+ 2 opoint)))) (overlay-put ov 'before-string "B") (overlay-put ov 'after-string "C") (put-text-property (1+ opoint) (+ 2 opoint) 'display `(image :data ,img-data :type xbm)))) ;; Overlays with adjacent before and after strings, and image text ;; prop. (insert " Result 3: ") (let ((opoint (point))) (insert "AXD\n") (let ((ov1 (make-overlay opoint (1+ opoint))) (ov2 (make-overlay (+ 2 opoint) (+ 3 opoint)))) (overlay-put ov1 'after-string "B") (overlay-put ov2 'before-string "C") (put-text-property (1+ opoint) (+ 2 opoint) 'display `(image :data ,img-data :type xbm)))) ;; Three overlays. (insert " Result 4: ") (let ((opoint (point))) (insert "AXD\n\n") (let ((ov1 (make-overlay opoint (1+ opoint))) (ov2 (make-overlay (+ 2 opoint) (+ 3 opoint))) (ov3 (make-overlay (1+ opoint) (+ 2 opoint)))) (overlay-put ov1 'after-string "B") (overlay-put ov2 'before-string "C") (overlay-put ov3 'display `(image :data ,img-data :type xbm)))))) (defun test-redisplay () (interactive) (let ((buf (get-buffer "*Redisplay Test*"))) (if buf (kill-buffer buf)) (pop-to-buffer (get-buffer-create "*Redisplay Test*")) (erase-buffer) (test-redisplay-1) (test-redisplay-2) (test-redisplay-3) (goto-char (point-min)))) ;; arch-tag: fcee53c8-024f-403d-9154-61ae3ce0bfb8