mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-01 13:21:11 -08:00
bc0426ce8e
Previously, in a remote directory, '(eshell-get-path)' would return a list of strings like "/ssh:localhost://usr/bin". While that shouldn't break most things, it's not strictly correct either. See bug#65551. * lisp/eshell/esh-util.el (eshell-get-path): Use 'concat' instead of 'file-name-concat'. * test/lisp/eshell/esh-util-tests.el: Require 'tramp' and 'eshell-tests-helpers'. (esh-util-test/path/get, eshell-util-test/path/get-remote): New tests.
87 lines
3.4 KiB
EmacsLisp
87 lines
3.4 KiB
EmacsLisp
;;; esh-util-tests.el --- esh-util test suite -*- lexical-binding:t -*-
|
|
|
|
;; Copyright (C) 2022-2023 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 'tramp)
|
|
(require 'ert)
|
|
(require 'esh-util)
|
|
|
|
(require 'eshell-tests-helpers
|
|
(expand-file-name "eshell-tests-helpers"
|
|
(file-name-directory (or load-file-name
|
|
default-directory))))
|
|
|
|
;;; Tests:
|
|
|
|
(ert-deftest esh-util-test/eshell-stringify/string ()
|
|
"Test that `eshell-stringify' preserves the value of strings."
|
|
(should (equal (eshell-stringify "hello") "hello")))
|
|
|
|
(ert-deftest esh-util-test/eshell-stringify/number ()
|
|
"Test that `eshell-stringify' converts numbers to strings."
|
|
(should (equal (eshell-stringify 42) "42"))
|
|
(should (equal (eshell-stringify 4.2) "4.2")))
|
|
|
|
(ert-deftest esh-util-test/eshell-stringify/t ()
|
|
"Test that `eshell-stringify' treats `t' according to `eshell-stringify-t'."
|
|
(let ((eshell-stringify-t t))
|
|
(should (equal (eshell-stringify t) "t")))
|
|
(let ((eshell-stringify-t nil))
|
|
(should (equal (eshell-stringify t) nil))))
|
|
|
|
(ert-deftest esh-util-test/eshell-stringify/nil ()
|
|
"Test that `eshell-stringify' converts nil to a string."
|
|
(should (equal (eshell-stringify nil) "nil")))
|
|
|
|
(ert-deftest esh-util-test/eshell-stringify/list ()
|
|
"Test that `eshell-stringify' correctly stringifies lists."
|
|
(should (equal (eshell-stringify '(1 2 3)) "(1 2 3)"))
|
|
(should (equal (eshell-stringify '((1 2) (3 . 4)))
|
|
"((1 2)\n (3 . 4))")))
|
|
|
|
(ert-deftest esh-util-test/eshell-stringify/complex ()
|
|
"Test that `eshell-stringify' correctly stringifies complex objects."
|
|
(should (equal (eshell-stringify (list 'quote 'hello)) "'hello")))
|
|
|
|
(ert-deftest esh-util-test/path/get ()
|
|
"Test that getting the Eshell path returns the expected results."
|
|
(let ((expected-path (butlast (exec-path))))
|
|
(should (equal (eshell-get-path)
|
|
(if (eshell-under-windows-p)
|
|
(cons "." expected-path)
|
|
expected-path)))
|
|
(should (equal (eshell-get-path 'literal)
|
|
expected-path))))
|
|
|
|
(ert-deftest esh-util-test/path/get-remote ()
|
|
"Test that getting the remote Eshell path returns the expected results."
|
|
(let* ((default-directory ert-remote-temporary-file-directory)
|
|
(expected-path (butlast (exec-path))))
|
|
;; Make sure we don't have a doubled directory separator.
|
|
(should (seq-every-p (lambda (i) (not (string-match-p "//" i)))
|
|
(eshell-get-path)))
|
|
(should (equal (eshell-get-path)
|
|
(mapcar (lambda (i)
|
|
(concat (file-remote-p default-directory) i))
|
|
expected-path)))
|
|
(should (equal (eshell-get-path 'literal)
|
|
expected-path))))
|
|
|
|
;;; esh-util-tests.el ends here
|