mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-30 09:00:31 -08:00
* CONTRIBUTE,Makefile.in,configure.ac: Update to reflect test directory moves. * test/file-organisation.org: New file. * test/automated/Makefile.in test/automated/data/decompress/foo.gz test/automated/data/epg/pubkey.asc test/automated/data/epg/seckey.asc test/automated/data/files-bug18141.el.gz test/automated/data/flymake/test.c test/automated/data/flymake/test.pl test/automated/data/package/archive-contents test/automated/data/package/key.pub test/automated/data/package/key.sec test/automated/data/package/multi-file-0.2.3.tar test/automated/data/package/multi-file-readme.txt test/automated/data/package/newer-versions/archive-contents test/automated/data/package/newer-versions/new-pkg-1.0.el test/automated/data/package/newer-versions/simple-single-1.4.el test/automated/data/package/package-test-server.py test/automated/data/package/signed/archive-contents test/automated/data/package/signed/archive-contents.sig test/automated/data/package/signed/signed-bad-1.0.el test/automated/data/package/signed/signed-bad-1.0.el.sig test/automated/data/package/signed/signed-good-1.0.el test/automated/data/package/signed/signed-good-1.0.el.sig test/automated/data/package/simple-depend-1.0.el test/automated/data/package/simple-single-1.3.el test/automated/data/package/simple-single-readme.txt test/automated/data/package/simple-two-depend-1.1.el test/automated/abbrev-tests.el test/automated/auto-revert-tests.el test/automated/calc-tests.el test/automated/icalendar-tests.el test/automated/character-fold-tests.el test/automated/comint-testsuite.el test/automated/descr-text-test.el test/automated/electric-tests.el test/automated/cl-generic-tests.el test/automated/cl-lib-tests.el test/automated/eieio-test-methodinvoke.el test/automated/eieio-test-persist.el test/automated/eieio-tests.el test/automated/ert-tests.el test/automated/ert-x-tests.el test/automated/generator-tests.el test/automated/let-alist.el test/automated/map-tests.el test/automated/advice-tests.el test/automated/package-test.el test/automated/pcase-tests.el test/automated/regexp-tests.el test/automated/seq-tests.el test/automated/subr-x-tests.el test/automated/tabulated-list-test.el test/automated/thunk-tests.el test/automated/timer-tests.el test/automated/epg-tests.el test/automated/eshell.el test/automated/faces-tests.el test/automated/file-notify-tests.el test/automated/auth-source-tests.el test/automated/gnus-tests.el test/automated/message-mode-tests.el test/automated/help-fns.el test/automated/imenu-test.el test/automated/info-xref.el test/automated/mule-util.el test/automated/isearch-tests.el test/automated/json-tests.el test/automated/bytecomp-tests.el test/automated/coding-tests.el test/automated/core-elisp-tests.el test/automated/decoder-tests.el test/automated/files.el test/automated/font-parse-tests.el test/automated/lexbind-tests.el test/automated/occur-tests.el test/automated/process-tests.el test/automated/syntax-tests.el test/automated/textprop-tests.el test/automated/undo-tests.el test/automated/man-tests.el test/automated/completion-tests.el test/automated/dbus-tests.el test/automated/newsticker-tests.el test/automated/sasl-scram-rfc-tests.el test/automated/tramp-tests.el test/automated/obarray-tests.el test/automated/compile-tests.el test/automated/elisp-mode-tests.el test/automated/f90.el test/automated/flymake-tests.el test/automated/python-tests.el test/automated/ruby-mode-tests.el test/automated/subword-tests.el test/automated/replace-tests.el test/automated/simple-test.el test/automated/sort-tests.el test/automated/subr-tests.el test/automated/reftex-tests.el test/automated/sgml-mode-tests.el test/automated/tildify-tests.el test/automated/thingatpt.el test/automated/url-future-tests.el test/automated/url-util-tests.el test/automated/add-log-tests.el test/automated/vc-bzr.el test/automated/vc-tests.el test/automated/xml-parse-tests.el test/BidiCharacterTest.txt test/biditest.el test/cedet/cedet-utests.el test/cedet/ede-tests.el test/cedet/semantic-ia-utest.el test/cedet/semantic-tests.el test/cedet/semantic-utest-c.el test/cedet/semantic-utest.el test/cedet/srecode-tests.el test/cedet/tests/test.c test/cedet/tests/test.el test/cedet/tests/test.make test/cedet/tests/testdoublens.cpp test/cedet/tests/testdoublens.hpp test/cedet/tests/testfriends.cpp test/cedet/tests/testjavacomp.java test/cedet/tests/testnsp.cpp test/cedet/tests/testpolymorph.cpp test/cedet/tests/testspp.c test/cedet/tests/testsppcomplete.c test/cedet/tests/testsppreplace.c test/cedet/tests/testsppreplaced.c test/cedet/tests/testsubclass.cpp test/cedet/tests/testsubclass.hh test/cedet/tests/testtypedefs.cpp test/cedet/tests/testvarnames.c test/etags/CTAGS.good test/etags/ETAGS.good_1 test/etags/ETAGS.good_2 test/etags/ETAGS.good_3 test/etags/ETAGS.good_4 test/etags/ETAGS.good_5 test/etags/ETAGS.good_6 test/etags/a-src/empty.zz test/etags/a-src/empty.zz.gz test/etags/ada-src/2ataspri.adb test/etags/ada-src/2ataspri.ads test/etags/ada-src/etags-test-for.ada test/etags/ada-src/waroquiers.ada test/etags/c-src/a/b/b.c test/etags/c-src/abbrev.c test/etags/c-src/c.c test/etags/c-src/dostorture.c test/etags/c-src/emacs/src/gmalloc.c test/etags/c-src/emacs/src/keyboard.c test/etags/c-src/emacs/src/lisp.h test/etags/c-src/emacs/src/regex.h test/etags/c-src/etags.c test/etags/c-src/exit.c test/etags/c-src/exit.strange_suffix test/etags/c-src/fail.c test/etags/c-src/getopt.h test/etags/c-src/h.h test/etags/c-src/machsyscalls.c test/etags/c-src/machsyscalls.h test/etags/c-src/sysdep.h test/etags/c-src/tab.c test/etags/c-src/torture.c test/etags/cp-src/MDiagArray2.h test/etags/cp-src/Range.h test/etags/cp-src/burton.cpp test/etags/cp-src/c.C test/etags/cp-src/clheir.cpp.gz test/etags/cp-src/clheir.hpp test/etags/cp-src/conway.cpp test/etags/cp-src/conway.hpp test/etags/cp-src/fail.C test/etags/cp-src/functions.cpp test/etags/cp-src/screen.cpp test/etags/cp-src/screen.hpp test/etags/cp-src/x.cc test/etags/el-src/TAGTEST.EL test/etags/el-src/emacs/lisp/progmodes/etags.el test/etags/erl-src/gs_dialog.erl test/etags/f-src/entry.for test/etags/f-src/entry.strange.gz test/etags/f-src/entry.strange_suffix test/etags/forth-src/test-forth.fth test/etags/html-src/algrthms.html test/etags/html-src/index.shtml test/etags/html-src/software.html test/etags/html-src/softwarelibero.html test/etags/lua-src/allegro.lua test/etags/objc-src/PackInsp.h test/etags/objc-src/PackInsp.m test/etags/objc-src/Subprocess.h test/etags/objc-src/Subprocess.m test/etags/objcpp-src/SimpleCalc.H test/etags/objcpp-src/SimpleCalc.M test/etags/pas-src/common.pas test/etags/perl-src/htlmify-cystic test/etags/perl-src/kai-test.pl test/etags/perl-src/yagrip.pl test/etags/php-src/lce_functions.php test/etags/php-src/ptest.php test/etags/php-src/sendmail.php test/etags/prol-src/natded.prolog test/etags/prol-src/ordsets.prolog test/etags/ps-src/rfc1245.ps test/etags/pyt-src/server.py test/etags/tex-src/gzip.texi test/etags/tex-src/nonewline.tex test/etags/tex-src/testenv.tex test/etags/tex-src/texinfo.tex test/etags/y-src/atest.y test/etags/y-src/cccp.c test/etags/y-src/cccp.y test/etags/y-src/parse.c test/etags/y-src/parse.y test/indent/css-mode.css test/indent/js-indent-init-dynamic.js test/indent/js-indent-init-t.js test/indent/js-jsx.js test/indent/js.js test/indent/latex-mode.tex test/indent/modula2.mod test/indent/nxml.xml test/indent/octave.m test/indent/pascal.pas test/indent/perl.perl test/indent/prolog.prolog test/indent/ps-mode.ps test/indent/ruby.rb test/indent/scheme.scm test/indent/scss-mode.scss test/indent/sgml-mode-attribute.html test/indent/shell.rc test/indent/shell.sh test/redisplay-testsuite.el test/rmailmm.el test/automated/buffer-tests.el test/automated/cmds-tests.el test/automated/data-tests.el test/automated/finalizer-tests.el test/automated/fns-tests.el test/automated/inotify-test.el test/automated/keymap-tests.el test/automated/print-tests.el test/automated/libxml-tests.el test/automated/zlib-tests.el: Files Moved.
252 lines
9 KiB
EmacsLisp
252 lines
9 KiB
EmacsLisp
;;; tests/eshell.el --- Eshell test suite
|
|
|
|
;; Copyright (C) 1999-2015 Free Software Foundation, Inc.
|
|
|
|
;; Author: John Wiegley <johnw@gnu.org>
|
|
|
|
;; 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:
|
|
|
|
;; Eshell test suite.
|
|
|
|
;;; Code:
|
|
|
|
(require 'ert)
|
|
(require 'eshell)
|
|
|
|
(defmacro with-temp-eshell (&rest body)
|
|
"Evaluate BODY in a temporary Eshell buffer."
|
|
`(let* ((eshell-directory-name (make-temp-file "eshell" t))
|
|
(eshell-history-file-name nil)
|
|
(eshell-buffer (eshell t)))
|
|
(unwind-protect
|
|
(with-current-buffer eshell-buffer
|
|
,@body)
|
|
(let (kill-buffer-query-functions)
|
|
(kill-buffer eshell-buffer)
|
|
(delete-directory eshell-directory-name t)))))
|
|
|
|
(defun eshell-insert-command (text &optional func)
|
|
"Insert a command at the end of the buffer."
|
|
(goto-char eshell-last-output-end)
|
|
(insert-and-inherit text)
|
|
(funcall (or func 'eshell-send-input)))
|
|
|
|
(defun eshell-match-result (regexp)
|
|
"Check that text after `eshell-last-input-end' matches REGEXP."
|
|
(goto-char eshell-last-input-end)
|
|
(should (string-match-p regexp (buffer-substring-no-properties
|
|
(point) (point-max)))))
|
|
|
|
(defun eshell-command-result-p (text regexp &optional func)
|
|
"Insert a command at the end of the buffer."
|
|
(eshell-insert-command text func)
|
|
(eshell-match-result regexp))
|
|
|
|
(defun eshell-test-command-result (command)
|
|
"Like `eshell-command-result', but not using HOME."
|
|
(let ((eshell-directory-name (make-temp-file "eshell" t))
|
|
(eshell-history-file-name nil))
|
|
(unwind-protect
|
|
(eshell-command-result command)
|
|
(delete-directory eshell-directory-name t))))
|
|
|
|
;;; Tests:
|
|
|
|
(ert-deftest eshell-test/simple-command-result ()
|
|
"Test `eshell-command-result' with a simple command."
|
|
(should (equal (eshell-test-command-result "+ 1 2") 3)))
|
|
|
|
(ert-deftest eshell-test/lisp-command ()
|
|
"Test `eshell-command-result' with an elisp command."
|
|
(should (equal (eshell-test-command-result "(+ 1 2)") 3)))
|
|
|
|
(ert-deftest eshell-test/for-loop ()
|
|
"Test `eshell-command-result' with a for loop.."
|
|
(let ((process-environment (cons "foo" process-environment)))
|
|
(should (equal (eshell-test-command-result
|
|
"for foo in 5 { echo $foo }") 5))))
|
|
|
|
(ert-deftest eshell-test/for-name-loop () ;Bug#15231
|
|
"Test `eshell-command-result' with a for loop using `name'."
|
|
(let ((process-environment (cons "name" process-environment)))
|
|
(should (equal (eshell-test-command-result
|
|
"for name in 3 { echo $name }") 3))))
|
|
|
|
(ert-deftest eshell-test/for-name-shadow-loop () ; bug#15372
|
|
"Test `eshell-command-result' with a for loop using an env-var."
|
|
(let ((process-environment (cons "name=env-value" process-environment)))
|
|
(with-temp-eshell
|
|
(eshell-command-result-p "echo $name; for name in 3 { echo $name }; echo $name"
|
|
"env-value\n3\nenv-value\n"))))
|
|
|
|
(ert-deftest eshell-test/lisp-command-args ()
|
|
"Test `eshell-command-result' with elisp and trailing args.
|
|
Test that trailing arguments outside the S-expression are
|
|
ignored. e.g. \"(+ 1 2) 3\" => 3"
|
|
(should (equal (eshell-test-command-result "(+ 1 2) 3") 3)))
|
|
|
|
(ert-deftest eshell-test/subcommand ()
|
|
"Test `eshell-command-result' with a simple subcommand."
|
|
(should (equal (eshell-test-command-result "{+ 1 2}") 3)))
|
|
|
|
(ert-deftest eshell-test/subcommand-args ()
|
|
"Test `eshell-command-result' with a subcommand and trailing args.
|
|
Test that trailing arguments outside the subcommand are ignored.
|
|
e.g. \"{+ 1 2} 3\" => 3"
|
|
(should (equal (eshell-test-command-result "{+ 1 2} 3") 3)))
|
|
|
|
(ert-deftest eshell-test/subcommand-lisp ()
|
|
"Test `eshell-command-result' with an elisp subcommand and trailing args.
|
|
Test that trailing arguments outside the subcommand are ignored.
|
|
e.g. \"{(+ 1 2)} 3\" => 3"
|
|
(should (equal (eshell-test-command-result "{(+ 1 2)} 3") 3)))
|
|
|
|
(ert-deftest eshell-test/interp-cmd ()
|
|
"Interpolate command result"
|
|
(should (equal (eshell-test-command-result "+ ${+ 1 2} 3") 6)))
|
|
|
|
(ert-deftest eshell-test/interp-lisp ()
|
|
"Interpolate Lisp form evaluation"
|
|
(should (equal (eshell-test-command-result "+ $(+ 1 2) 3") 6)))
|
|
|
|
(ert-deftest eshell-test/interp-concat ()
|
|
"Interpolate and concat command"
|
|
(should (equal (eshell-test-command-result "+ ${+ 1 2}3 3") 36)))
|
|
|
|
(ert-deftest eshell-test/interp-concat-lisp ()
|
|
"Interpolate and concat Lisp form"
|
|
(should (equal (eshell-test-command-result "+ $(+ 1 2)3 3") 36)))
|
|
|
|
(ert-deftest eshell-test/interp-concat2 ()
|
|
"Interpolate and concat two commands"
|
|
(should (equal (eshell-test-command-result "+ ${+ 1 2}${+ 1 2} 3") 36)))
|
|
|
|
(ert-deftest eshell-test/interp-concat-lisp2 ()
|
|
"Interpolate and concat two Lisp forms"
|
|
(should (equal (eshell-test-command-result "+ $(+ 1 2)$(+ 1 2) 3") 36)))
|
|
|
|
(ert-deftest eshell-test/window-height ()
|
|
"$LINES should equal (window-height)"
|
|
(should (eshell-test-command-result "= $LINES (window-height)")))
|
|
|
|
(ert-deftest eshell-test/window-width ()
|
|
"$COLUMNS should equal (window-width)"
|
|
(should (eshell-test-command-result "= $COLUMNS (window-width)")))
|
|
|
|
(ert-deftest eshell-test/last-result-var ()
|
|
"Test using the \"last result\" ($$) variable"
|
|
(with-temp-eshell
|
|
(eshell-command-result-p "+ 1 2; + $$ 2"
|
|
"3\n5\n")))
|
|
|
|
(ert-deftest eshell-test/last-result-var2 ()
|
|
"Test using the \"last result\" ($$) variable twice"
|
|
(with-temp-eshell
|
|
(eshell-command-result-p "+ 1 2; + $$ $$"
|
|
"3\n6\n")))
|
|
|
|
(ert-deftest eshell-test/last-arg-var ()
|
|
"Test using the \"last arg\" ($_) variable"
|
|
(with-temp-eshell
|
|
(eshell-command-result-p "+ 1 2; + $_ 4"
|
|
"3\n6\n")))
|
|
|
|
(ert-deftest eshell-test/escape-nonspecial ()
|
|
"Test that \"\\c\" and \"c\" are equivalent when \"c\" is not a
|
|
special character."
|
|
(with-temp-eshell
|
|
(eshell-command-result-p "echo he\\llo"
|
|
"hello\n")))
|
|
|
|
(ert-deftest eshell-test/escape-nonspecial-unicode ()
|
|
"Test that \"\\c\" and \"c\" are equivalent when \"c\" is a
|
|
unicode character (unicode characters are nonspecial by
|
|
definition)."
|
|
(with-temp-eshell
|
|
(eshell-command-result-p "echo Vid\\éos"
|
|
"Vidéos\n")))
|
|
|
|
(ert-deftest eshell-test/escape-nonspecial-quoted ()
|
|
"Test that the backslash is preserved for escaped nonspecial
|
|
chars"
|
|
(with-temp-eshell
|
|
(eshell-command-result-p "echo \"h\\i\""
|
|
;; Backslashes are doubled for regexp.
|
|
"h\\\\i\n")))
|
|
|
|
(ert-deftest eshell-test/escape-special-quoted ()
|
|
"Test that the backslash is not preserved for escaped special
|
|
chars"
|
|
(with-temp-eshell
|
|
(eshell-command-result-p "echo \"h\\\\i\""
|
|
;; Backslashes are doubled for regexp.
|
|
"h\\\\i\n")))
|
|
|
|
(ert-deftest eshell-test/command-running-p ()
|
|
"Modeline should show no command running"
|
|
(with-temp-eshell
|
|
(let ((eshell-status-in-mode-line t))
|
|
(should (memq 'eshell-command-running-string mode-line-format))
|
|
(should (equal eshell-command-running-string "--")))))
|
|
|
|
(ert-deftest eshell-test/forward-arg ()
|
|
"Test moving across command arguments"
|
|
(with-temp-eshell
|
|
(eshell-insert-command "echo $(+ 1 (- 4 3)) \"alpha beta\" file" 'ignore)
|
|
(let ((here (point)) begin valid)
|
|
(eshell-bol)
|
|
(setq begin (point))
|
|
(eshell-forward-argument 4)
|
|
(setq valid (= here (point)))
|
|
(eshell-backward-argument 4)
|
|
(prog1
|
|
(and valid (= begin (point)))
|
|
(eshell-bol)
|
|
(delete-region (point) (point-max))))))
|
|
|
|
(ert-deftest eshell-test/queue-input ()
|
|
"Test queuing command input"
|
|
(with-temp-eshell
|
|
(eshell-insert-command "sleep 2")
|
|
(eshell-insert-command "echo alpha" 'eshell-queue-input)
|
|
(let ((count 10))
|
|
(while (and eshell-current-command
|
|
(> count 0))
|
|
(sit-for 1)
|
|
(setq count (1- count))))
|
|
(eshell-match-result "alpha\n")))
|
|
|
|
(ert-deftest eshell-test/flush-output ()
|
|
"Test flushing of previous output"
|
|
(with-temp-eshell
|
|
(eshell-insert-command "echo alpha")
|
|
(eshell-kill-output)
|
|
(eshell-match-result (regexp-quote "*** output flushed ***\n"))
|
|
(should (forward-line))
|
|
(should (= (point) eshell-last-output-start))))
|
|
|
|
(ert-deftest eshell-test/run-old-command ()
|
|
"Re-run an old command"
|
|
(with-temp-eshell
|
|
(eshell-insert-command "echo alpha")
|
|
(goto-char eshell-last-input-start)
|
|
(string= (eshell-get-old-input) "echo alpha")))
|
|
|
|
(provide 'esh-test)
|
|
|
|
;;; tests/eshell.el ends here
|