2016-08-05 19:59:52 -04:00
|
|
|
|
;;; cl-extra-tests.el --- tests for emacs-lisp/cl-extra.el -*- lexical-binding:t -*-
|
|
|
|
|
|
|
2025-01-01 07:39:17 +00:00
|
|
|
|
;; Copyright (C) 2013-2025 Free Software Foundation, Inc.
|
2016-08-05 19:59:52 -04:00
|
|
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
|
2021-02-08 09:03:27 +01:00
|
|
|
|
;; 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.
|
|
|
|
|
|
|
2016-08-05 19:59:52 -04:00
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2021-02-08 09:03:27 +01:00
|
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
2016-08-05 19:59:52 -04:00
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
|
|
|
|
(require 'cl-lib)
|
|
|
|
|
|
(require 'ert)
|
|
|
|
|
|
|
Consolidate some cl-lib tests
For discussion, see bug#75633#16 and the following thread:
https://lists.gnu.org/r/emacs-devel/2025-02/msg00053.html
* test/lisp/emacs-lisp/cl-extra-tests.el (cl-lib-test-remprop)
(cl-lib-test-coerce-to-vector, cl-parse-integer): Move here from
cl-lib-tests.el.
(cl-extra-test-remprop): Remove duplicate test, folding body...
(cl-get): ...into this test.
(cl-extra-test-concatenate): Remove duplicate test, folding body...
(cl-concatenate): ...into this test.
* test/lisp/emacs-lisp/cl-lib-tests.el: Update historic commentary.
(cl-lib-test-remprop, cl-lib-test-coerce-to-vector)
(cl-parse-integer): Move to cl-extra-tests.el.
(cl-lib-test-remove-if-not, cl-lib-test-remove)
(cl-lib-test-set-functions, cl-lib-test-string-position)
(cl-lib-test-mismatch, cl-nset-difference): Move to cl-seq-tests.el.
(cl-lib-test-gensym, cl-lib-keyword-names-versus-values)
(cl-lib-empty-keyargs, mystruct, cl-lib-struct-accessors)
(cl-lib-struct-constructors, cl-lib-arglist-performance, cl-the)
(cl-flet-test, cl-lib-test-typep, cl-lib-symbol-macrolet)
(cl-lib-symbol-macrolet-4+5, cl-lib-symbol-macrolet-2)
(cl-lib-symbol-macrolet-hide, cl-lib-defstruct-record): Move to
cl-macs-tests.el.
(cl-lib-test-endp): Remove duplicate test, folding body into
cl-seq-endp-test.
(cl-lib-set-difference): Remove duplicate test, folding body into
cl-set-difference-test.
* test/lisp/emacs-lisp/cl-macs-tests.el: Do not require cl-macs and
pcase.
(mystruct, cl-lib-struct-accessors, cl-lib-struct-constructors)
(cl-lib-arglist-performance, cl-lib-defstruct-record)
(cl-lib-symbol-macrolet, cl-lib-symbol-macrolet-4+5)
(cl-lib-symbol-macrolet-2, cl-lib-symbol-macrolet-hide, cl-flet-test)
(cl-lib-keyword-names-versus-values, cl-lib-empty-keyargs)
(cl-lib-test-gensym, cl-the, cl-lib-test-typep): Move here from
cl-lib-tests.el.
(cl-case-error, cl-case-warning): Fix indentation.
* test/lisp/emacs-lisp/cl-seq-tests.el: Require cl-lib rather than
cl-seq.
(cl-seq-endp-test): Absorb body of cl-lib-test-endp.
(cl-lib-test-remove, cl-lib-test-remove-if-not)
(cl-lib-test-string-position, cl-lib-test-mismatch)
(cl-lib-test-set-functions, cl-nset-difference): Move here from
cl-lib-tests.el.
(cl-set-difference-test): Absorb body of cl-lib-set-difference.
2025-02-02 17:18:52 +01:00
|
|
|
|
(ert-deftest cl-lib-test-remprop ()
|
|
|
|
|
|
(let ((x (cl-gensym)))
|
|
|
|
|
|
(should (equal (symbol-plist x) '()))
|
|
|
|
|
|
;; Remove nonexistent property on empty plist.
|
|
|
|
|
|
(cl-remprop x 'b)
|
|
|
|
|
|
(should (equal (symbol-plist x) '()))
|
|
|
|
|
|
(put x 'a 1)
|
|
|
|
|
|
(should (equal (symbol-plist x) '(a 1)))
|
|
|
|
|
|
;; Remove nonexistent property on nonempty plist.
|
|
|
|
|
|
(cl-remprop x 'b)
|
|
|
|
|
|
(should (equal (symbol-plist x) '(a 1)))
|
|
|
|
|
|
(put x 'b 2)
|
|
|
|
|
|
(put x 'c 3)
|
|
|
|
|
|
(put x 'd 4)
|
|
|
|
|
|
(should (equal (symbol-plist x) '(a 1 b 2 c 3 d 4)))
|
|
|
|
|
|
;; Remove property that is neither first nor last.
|
|
|
|
|
|
(cl-remprop x 'c)
|
|
|
|
|
|
(should (equal (symbol-plist x) '(a 1 b 2 d 4)))
|
|
|
|
|
|
;; Remove last property from a plist of length >1.
|
|
|
|
|
|
(cl-remprop x 'd)
|
|
|
|
|
|
(should (equal (symbol-plist x) '(a 1 b 2)))
|
|
|
|
|
|
;; Remove first property from a plist of length >1.
|
|
|
|
|
|
(cl-remprop x 'a)
|
|
|
|
|
|
(should (equal (symbol-plist x) '(b 2)))
|
|
|
|
|
|
;; Remove property when there is only one.
|
|
|
|
|
|
(cl-remprop x 'b)
|
|
|
|
|
|
(should (equal (symbol-plist x) '()))))
|
|
|
|
|
|
|
2016-08-05 19:59:52 -04:00
|
|
|
|
(ert-deftest cl-get ()
|
|
|
|
|
|
(put 'cl-get-test 'x 1)
|
|
|
|
|
|
(put 'cl-get-test 'y nil)
|
|
|
|
|
|
(should (eq (cl-get 'cl-get-test 'x) 1))
|
|
|
|
|
|
(should (eq (cl-get 'cl-get-test 'y :none) nil))
|
Consolidate some cl-lib tests
For discussion, see bug#75633#16 and the following thread:
https://lists.gnu.org/r/emacs-devel/2025-02/msg00053.html
* test/lisp/emacs-lisp/cl-extra-tests.el (cl-lib-test-remprop)
(cl-lib-test-coerce-to-vector, cl-parse-integer): Move here from
cl-lib-tests.el.
(cl-extra-test-remprop): Remove duplicate test, folding body...
(cl-get): ...into this test.
(cl-extra-test-concatenate): Remove duplicate test, folding body...
(cl-concatenate): ...into this test.
* test/lisp/emacs-lisp/cl-lib-tests.el: Update historic commentary.
(cl-lib-test-remprop, cl-lib-test-coerce-to-vector)
(cl-parse-integer): Move to cl-extra-tests.el.
(cl-lib-test-remove-if-not, cl-lib-test-remove)
(cl-lib-test-set-functions, cl-lib-test-string-position)
(cl-lib-test-mismatch, cl-nset-difference): Move to cl-seq-tests.el.
(cl-lib-test-gensym, cl-lib-keyword-names-versus-values)
(cl-lib-empty-keyargs, mystruct, cl-lib-struct-accessors)
(cl-lib-struct-constructors, cl-lib-arglist-performance, cl-the)
(cl-flet-test, cl-lib-test-typep, cl-lib-symbol-macrolet)
(cl-lib-symbol-macrolet-4+5, cl-lib-symbol-macrolet-2)
(cl-lib-symbol-macrolet-hide, cl-lib-defstruct-record): Move to
cl-macs-tests.el.
(cl-lib-test-endp): Remove duplicate test, folding body into
cl-seq-endp-test.
(cl-lib-set-difference): Remove duplicate test, folding body into
cl-set-difference-test.
* test/lisp/emacs-lisp/cl-macs-tests.el: Do not require cl-macs and
pcase.
(mystruct, cl-lib-struct-accessors, cl-lib-struct-constructors)
(cl-lib-arglist-performance, cl-lib-defstruct-record)
(cl-lib-symbol-macrolet, cl-lib-symbol-macrolet-4+5)
(cl-lib-symbol-macrolet-2, cl-lib-symbol-macrolet-hide, cl-flet-test)
(cl-lib-keyword-names-versus-values, cl-lib-empty-keyargs)
(cl-lib-test-gensym, cl-the, cl-lib-test-typep): Move here from
cl-lib-tests.el.
(cl-case-error, cl-case-warning): Fix indentation.
* test/lisp/emacs-lisp/cl-seq-tests.el: Require cl-lib rather than
cl-seq.
(cl-seq-endp-test): Absorb body of cl-lib-test-endp.
(cl-lib-test-remove, cl-lib-test-remove-if-not)
(cl-lib-test-string-position, cl-lib-test-mismatch)
(cl-lib-test-set-functions, cl-nset-difference): Move here from
cl-lib-tests.el.
(cl-set-difference-test): Absorb body of cl-lib-set-difference.
2025-02-02 17:18:52 +01:00
|
|
|
|
(should (eq (cl-get 'cl-get-test 'z :none) :none))
|
|
|
|
|
|
(let ((sym (make-symbol "test")))
|
|
|
|
|
|
(put sym 'foo 'bar)
|
|
|
|
|
|
(should (equal (cl-get sym 'foo) 'bar))
|
|
|
|
|
|
(cl-remprop sym 'foo)
|
|
|
|
|
|
(should (equal (cl-get sym 'foo 'default) 'default))))
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest cl-lib-test-coerce-to-vector ()
|
|
|
|
|
|
(let* ((a (vector))
|
|
|
|
|
|
(b (vector 1 a 3))
|
|
|
|
|
|
(c (list))
|
|
|
|
|
|
(d (list b a)))
|
|
|
|
|
|
(should (eql (cl-coerce a 'vector) a))
|
|
|
|
|
|
(should (eql (cl-coerce b 'vector) b))
|
|
|
|
|
|
(should (equal (cl-coerce c 'vector) (vector)))
|
|
|
|
|
|
(should (equal (cl-coerce d 'vector) (vector b a)))))
|
2016-08-05 19:59:52 -04:00
|
|
|
|
|
2025-01-17 09:48:57 -05:00
|
|
|
|
(ert-deftest cl-extra-test-coerce ()
|
|
|
|
|
|
(should (equal (cl-coerce "abc" 'list) '(?a ?b ?c)))
|
|
|
|
|
|
(should (equal (cl-coerce ["a" "b" "c"] 'list) '("a" "b" "c")))
|
|
|
|
|
|
(should (equal (cl-coerce "abc" 'vector) [97 98 99]))
|
|
|
|
|
|
(should (equal (cl-coerce '("a" "b" "c") 'vector) ["a" "b" "c"]))
|
|
|
|
|
|
(should (equal (cl-coerce '(3 4) 'bool-vector) #&2""))
|
|
|
|
|
|
(should (equal (cl-coerce "abc" 'bool-vector) #&3""))
|
|
|
|
|
|
(should (equal (cl-coerce [1] 'string) (char-to-string 1)))
|
|
|
|
|
|
(should (equal (cl-coerce '(1) 'string) (char-to-string 1)))
|
|
|
|
|
|
(should (equal (cl-coerce '(1 2 3) 'array) [1 2 3]))
|
|
|
|
|
|
(should (equal (cl-coerce "abc" 'array) "abc"))
|
|
|
|
|
|
(should-error (cl-coerce (list 1 2 3) 'character))
|
|
|
|
|
|
(should-error (cl-coerce [1 2 3] 'character))
|
|
|
|
|
|
(should-error (cl-coerce "abc" 'character))
|
|
|
|
|
|
(should (equal (cl-coerce "a" 'character) 97))
|
|
|
|
|
|
(should (equal (cl-coerce 'a 'character) 97)))
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest cl-extra-test-equalp ()
|
|
|
|
|
|
(should (cl-equalp "Test" "test"))
|
|
|
|
|
|
(should (cl-equalp 1 1.0))
|
|
|
|
|
|
(should (cl-equalp '(1 2 3) '(1 2 3)))
|
|
|
|
|
|
(should (cl-equalp [1 2 3] [1 2 3]))
|
|
|
|
|
|
(should-not (cl-equalp "Test1" "Test2"))
|
|
|
|
|
|
(should-not (cl-equalp 1 2))
|
|
|
|
|
|
(should-not (cl-equalp '(1 2 3) '(4 5 6)))
|
|
|
|
|
|
(should-not (cl-equalp [1 2 3] [4 5 6])))
|
|
|
|
|
|
|
2016-08-05 19:59:52 -04:00
|
|
|
|
(ert-deftest cl-getf ()
|
|
|
|
|
|
(let ((plist '(x 1 y nil)))
|
|
|
|
|
|
(should (eq (cl-getf plist 'x) 1))
|
Audit some plist uses with new predicate argument
* doc/lispref/lists.texi (Plist Access): Improve description of
default predicate.
* lisp/emacs-lisp/cl-extra.el (cl-getf, cl--set-getf): Assume
plist-member always returns a cons.
* lisp/emacs-lisp/gv.el (plist-get): Support new optional predicate
argument (bug#47425#91).
* lisp/emacs-lisp/map.el: Bump minor version.
(map--dispatch): Remove now that bug#58563 is fixed. Break two
remaining uses out into corresponding cl-defmethods.
(map--plist-p): Add docstring.
(map--plist-has-predicate, map--plist-member-1, map--plist-member)
(map--plist-put-1, map--plist-put): New definitions for supporting
predicate argument backward compatibly.
(map-elt): Fix generalized variable getter under a
predicate (bug#58531). Use predicate when given a plist.
(map-put): Avoid gratuitous warnings when called without the hidden
predicate argument. Improve obsoletion message.
(map-put!): Use predicate when given a plist.
(map-contains-key): Ditto. Declare forgotten
advertised-calling-convention (bug#58531#19).
(map--put): Group definition in file together with that of map-put!.
* lisp/files-x.el (connection-local-normalize-criteria): Simplify
using mapcan + plist-get.
* lisp/net/eudc.el (eudc--plist-member): New convenience function.
(eudc-plist-member, eudc-plist-get, eudc-lax-plist-get): Use it
instead of open-coding plist-member.
* src/fns.c (Fplist_get, plist_get, Fplist_put, plist_put): Pass the
plist element as the first argument to the predicate, for
consistency with assoc + alist-get.
(Fplist_member, plist_member): Move from widget to plist section.
Open-code the EQ case in plist_member, and call it from
Fplist_member in that case, rather than the other way around.
* test/lisp/apropos-tests.el (apropos-tests-format-plist): Avoid
polluting obarray.
* test/lisp/emacs-lisp/cl-extra-tests.el (cl-getf): Extend test with
generalized variables, degenerate plists, and improper lists.
* test/lisp/emacs-lisp/gv-tests.el: Byte-compile file; in the
meantime bug#24402 seems to have been fixed or worked around.
(gv-setter-edebug): Inhibit printing messages.
(gv-plist-get): Avoid modifying constant literals. Also test with a
predicate argument.
* test/lisp/emacs-lisp/map-tests.el (with-maps-do): Simplify
docstring.
(test-map-elt-testfn): Rename...
(test-map-elt-testfn-alist): ...to this. Also test with a predicate
argument.
(test-map-elt-testfn-plist, test-map-elt-gv, test-map-elt-signature)
(test-map-put!-plist, test-map-put!-signature)
(test-map-contains-key-signature, test-map-plist-member)
(test-map-plist-put): New tests.
(test-map-contains-key-testfn): Also test with a predicate argument.
(test-map-setf-alist-overwrite-key, test-map-setf-plist-insert-key)
(test-map-setf-plist-overwrite-key): Avoid modifying constant
literals.
(test-hash-table-setf-insert-key)
(test-hash-table-setf-overwrite-key): Fix indentation.
(test-setf-map-with-function): Make test more precise.
* test/lisp/net/eudc-tests.el: New file.
* test/lisp/subr-tests.el (test-plistp): Extend test with circular
list.
* test/src/fns-tests.el (test-cycle-equal, test-cycle-nconc): Move
from plist section to circular list section.
(plist-put/odd-number-of-elements): Avoid modifying constant
literals.
(plist-member/improper-list): Simplify.
(test-plist): Move to plist section. Also test with a predicate
argument.
2022-08-20 16:32:33 +03:00
|
|
|
|
(should-not (cl-getf plist 'y :none))
|
|
|
|
|
|
(should (eq (cl-getf plist 'z :none) :none))
|
2025-02-22 19:14:51 +01:00
|
|
|
|
(should (eq (incf (cl-getf plist 'x 10) 2) 3))
|
Audit some plist uses with new predicate argument
* doc/lispref/lists.texi (Plist Access): Improve description of
default predicate.
* lisp/emacs-lisp/cl-extra.el (cl-getf, cl--set-getf): Assume
plist-member always returns a cons.
* lisp/emacs-lisp/gv.el (plist-get): Support new optional predicate
argument (bug#47425#91).
* lisp/emacs-lisp/map.el: Bump minor version.
(map--dispatch): Remove now that bug#58563 is fixed. Break two
remaining uses out into corresponding cl-defmethods.
(map--plist-p): Add docstring.
(map--plist-has-predicate, map--plist-member-1, map--plist-member)
(map--plist-put-1, map--plist-put): New definitions for supporting
predicate argument backward compatibly.
(map-elt): Fix generalized variable getter under a
predicate (bug#58531). Use predicate when given a plist.
(map-put): Avoid gratuitous warnings when called without the hidden
predicate argument. Improve obsoletion message.
(map-put!): Use predicate when given a plist.
(map-contains-key): Ditto. Declare forgotten
advertised-calling-convention (bug#58531#19).
(map--put): Group definition in file together with that of map-put!.
* lisp/files-x.el (connection-local-normalize-criteria): Simplify
using mapcan + plist-get.
* lisp/net/eudc.el (eudc--plist-member): New convenience function.
(eudc-plist-member, eudc-plist-get, eudc-lax-plist-get): Use it
instead of open-coding plist-member.
* src/fns.c (Fplist_get, plist_get, Fplist_put, plist_put): Pass the
plist element as the first argument to the predicate, for
consistency with assoc + alist-get.
(Fplist_member, plist_member): Move from widget to plist section.
Open-code the EQ case in plist_member, and call it from
Fplist_member in that case, rather than the other way around.
* test/lisp/apropos-tests.el (apropos-tests-format-plist): Avoid
polluting obarray.
* test/lisp/emacs-lisp/cl-extra-tests.el (cl-getf): Extend test with
generalized variables, degenerate plists, and improper lists.
* test/lisp/emacs-lisp/gv-tests.el: Byte-compile file; in the
meantime bug#24402 seems to have been fixed or worked around.
(gv-setter-edebug): Inhibit printing messages.
(gv-plist-get): Avoid modifying constant literals. Also test with a
predicate argument.
* test/lisp/emacs-lisp/map-tests.el (with-maps-do): Simplify
docstring.
(test-map-elt-testfn): Rename...
(test-map-elt-testfn-alist): ...to this. Also test with a predicate
argument.
(test-map-elt-testfn-plist, test-map-elt-gv, test-map-elt-signature)
(test-map-put!-plist, test-map-put!-signature)
(test-map-contains-key-signature, test-map-plist-member)
(test-map-plist-put): New tests.
(test-map-contains-key-testfn): Also test with a predicate argument.
(test-map-setf-alist-overwrite-key, test-map-setf-plist-insert-key)
(test-map-setf-plist-overwrite-key): Avoid modifying constant
literals.
(test-hash-table-setf-insert-key)
(test-hash-table-setf-overwrite-key): Fix indentation.
(test-setf-map-with-function): Make test more precise.
* test/lisp/net/eudc-tests.el: New file.
* test/lisp/subr-tests.el (test-plistp): Extend test with circular
list.
* test/src/fns-tests.el (test-cycle-equal, test-cycle-nconc): Move
from plist section to circular list section.
(plist-put/odd-number-of-elements): Avoid modifying constant
literals.
(plist-member/improper-list): Simplify.
(test-plist): Move to plist section. Also test with a predicate
argument.
2022-08-20 16:32:33 +03:00
|
|
|
|
(should (equal plist '(x 3 y nil)))
|
2025-02-22 19:14:51 +01:00
|
|
|
|
(should-error (incf (cl-getf plist 'y 10) 4) :type 'wrong-type-argument)
|
Audit some plist uses with new predicate argument
* doc/lispref/lists.texi (Plist Access): Improve description of
default predicate.
* lisp/emacs-lisp/cl-extra.el (cl-getf, cl--set-getf): Assume
plist-member always returns a cons.
* lisp/emacs-lisp/gv.el (plist-get): Support new optional predicate
argument (bug#47425#91).
* lisp/emacs-lisp/map.el: Bump minor version.
(map--dispatch): Remove now that bug#58563 is fixed. Break two
remaining uses out into corresponding cl-defmethods.
(map--plist-p): Add docstring.
(map--plist-has-predicate, map--plist-member-1, map--plist-member)
(map--plist-put-1, map--plist-put): New definitions for supporting
predicate argument backward compatibly.
(map-elt): Fix generalized variable getter under a
predicate (bug#58531). Use predicate when given a plist.
(map-put): Avoid gratuitous warnings when called without the hidden
predicate argument. Improve obsoletion message.
(map-put!): Use predicate when given a plist.
(map-contains-key): Ditto. Declare forgotten
advertised-calling-convention (bug#58531#19).
(map--put): Group definition in file together with that of map-put!.
* lisp/files-x.el (connection-local-normalize-criteria): Simplify
using mapcan + plist-get.
* lisp/net/eudc.el (eudc--plist-member): New convenience function.
(eudc-plist-member, eudc-plist-get, eudc-lax-plist-get): Use it
instead of open-coding plist-member.
* src/fns.c (Fplist_get, plist_get, Fplist_put, plist_put): Pass the
plist element as the first argument to the predicate, for
consistency with assoc + alist-get.
(Fplist_member, plist_member): Move from widget to plist section.
Open-code the EQ case in plist_member, and call it from
Fplist_member in that case, rather than the other way around.
* test/lisp/apropos-tests.el (apropos-tests-format-plist): Avoid
polluting obarray.
* test/lisp/emacs-lisp/cl-extra-tests.el (cl-getf): Extend test with
generalized variables, degenerate plists, and improper lists.
* test/lisp/emacs-lisp/gv-tests.el: Byte-compile file; in the
meantime bug#24402 seems to have been fixed or worked around.
(gv-setter-edebug): Inhibit printing messages.
(gv-plist-get): Avoid modifying constant literals. Also test with a
predicate argument.
* test/lisp/emacs-lisp/map-tests.el (with-maps-do): Simplify
docstring.
(test-map-elt-testfn): Rename...
(test-map-elt-testfn-alist): ...to this. Also test with a predicate
argument.
(test-map-elt-testfn-plist, test-map-elt-gv, test-map-elt-signature)
(test-map-put!-plist, test-map-put!-signature)
(test-map-contains-key-signature, test-map-plist-member)
(test-map-plist-put): New tests.
(test-map-contains-key-testfn): Also test with a predicate argument.
(test-map-setf-alist-overwrite-key, test-map-setf-plist-insert-key)
(test-map-setf-plist-overwrite-key): Avoid modifying constant
literals.
(test-hash-table-setf-insert-key)
(test-hash-table-setf-overwrite-key): Fix indentation.
(test-setf-map-with-function): Make test more precise.
* test/lisp/net/eudc-tests.el: New file.
* test/lisp/subr-tests.el (test-plistp): Extend test with circular
list.
* test/src/fns-tests.el (test-cycle-equal, test-cycle-nconc): Move
from plist section to circular list section.
(plist-put/odd-number-of-elements): Avoid modifying constant
literals.
(plist-member/improper-list): Simplify.
(test-plist): Move to plist section. Also test with a predicate
argument.
2022-08-20 16:32:33 +03:00
|
|
|
|
(should (equal plist '(x 3 y nil)))
|
2025-02-22 19:14:51 +01:00
|
|
|
|
(should (eq (incf (cl-getf plist 'z 10) 5) 15))
|
Audit some plist uses with new predicate argument
* doc/lispref/lists.texi (Plist Access): Improve description of
default predicate.
* lisp/emacs-lisp/cl-extra.el (cl-getf, cl--set-getf): Assume
plist-member always returns a cons.
* lisp/emacs-lisp/gv.el (plist-get): Support new optional predicate
argument (bug#47425#91).
* lisp/emacs-lisp/map.el: Bump minor version.
(map--dispatch): Remove now that bug#58563 is fixed. Break two
remaining uses out into corresponding cl-defmethods.
(map--plist-p): Add docstring.
(map--plist-has-predicate, map--plist-member-1, map--plist-member)
(map--plist-put-1, map--plist-put): New definitions for supporting
predicate argument backward compatibly.
(map-elt): Fix generalized variable getter under a
predicate (bug#58531). Use predicate when given a plist.
(map-put): Avoid gratuitous warnings when called without the hidden
predicate argument. Improve obsoletion message.
(map-put!): Use predicate when given a plist.
(map-contains-key): Ditto. Declare forgotten
advertised-calling-convention (bug#58531#19).
(map--put): Group definition in file together with that of map-put!.
* lisp/files-x.el (connection-local-normalize-criteria): Simplify
using mapcan + plist-get.
* lisp/net/eudc.el (eudc--plist-member): New convenience function.
(eudc-plist-member, eudc-plist-get, eudc-lax-plist-get): Use it
instead of open-coding plist-member.
* src/fns.c (Fplist_get, plist_get, Fplist_put, plist_put): Pass the
plist element as the first argument to the predicate, for
consistency with assoc + alist-get.
(Fplist_member, plist_member): Move from widget to plist section.
Open-code the EQ case in plist_member, and call it from
Fplist_member in that case, rather than the other way around.
* test/lisp/apropos-tests.el (apropos-tests-format-plist): Avoid
polluting obarray.
* test/lisp/emacs-lisp/cl-extra-tests.el (cl-getf): Extend test with
generalized variables, degenerate plists, and improper lists.
* test/lisp/emacs-lisp/gv-tests.el: Byte-compile file; in the
meantime bug#24402 seems to have been fixed or worked around.
(gv-setter-edebug): Inhibit printing messages.
(gv-plist-get): Avoid modifying constant literals. Also test with a
predicate argument.
* test/lisp/emacs-lisp/map-tests.el (with-maps-do): Simplify
docstring.
(test-map-elt-testfn): Rename...
(test-map-elt-testfn-alist): ...to this. Also test with a predicate
argument.
(test-map-elt-testfn-plist, test-map-elt-gv, test-map-elt-signature)
(test-map-put!-plist, test-map-put!-signature)
(test-map-contains-key-signature, test-map-plist-member)
(test-map-plist-put): New tests.
(test-map-contains-key-testfn): Also test with a predicate argument.
(test-map-setf-alist-overwrite-key, test-map-setf-plist-insert-key)
(test-map-setf-plist-overwrite-key): Avoid modifying constant
literals.
(test-hash-table-setf-insert-key)
(test-hash-table-setf-overwrite-key): Fix indentation.
(test-setf-map-with-function): Make test more precise.
* test/lisp/net/eudc-tests.el: New file.
* test/lisp/subr-tests.el (test-plistp): Extend test with circular
list.
* test/src/fns-tests.el (test-cycle-equal, test-cycle-nconc): Move
from plist section to circular list section.
(plist-put/odd-number-of-elements): Avoid modifying constant
literals.
(plist-member/improper-list): Simplify.
(test-plist): Move to plist section. Also test with a predicate
argument.
2022-08-20 16:32:33 +03:00
|
|
|
|
(should (equal plist '(z 15 x 3 y nil))))
|
|
|
|
|
|
(let ((plist '(x 1 y)))
|
|
|
|
|
|
(should (eq (cl-getf plist 'x) 1))
|
|
|
|
|
|
(should (eq (cl-getf plist 'y :none) :none))
|
|
|
|
|
|
(should (eq (cl-getf plist 'z :none) :none))
|
2025-02-22 19:14:51 +01:00
|
|
|
|
(should (eq (incf (cl-getf plist 'x 10) 2) 3))
|
Audit some plist uses with new predicate argument
* doc/lispref/lists.texi (Plist Access): Improve description of
default predicate.
* lisp/emacs-lisp/cl-extra.el (cl-getf, cl--set-getf): Assume
plist-member always returns a cons.
* lisp/emacs-lisp/gv.el (plist-get): Support new optional predicate
argument (bug#47425#91).
* lisp/emacs-lisp/map.el: Bump minor version.
(map--dispatch): Remove now that bug#58563 is fixed. Break two
remaining uses out into corresponding cl-defmethods.
(map--plist-p): Add docstring.
(map--plist-has-predicate, map--plist-member-1, map--plist-member)
(map--plist-put-1, map--plist-put): New definitions for supporting
predicate argument backward compatibly.
(map-elt): Fix generalized variable getter under a
predicate (bug#58531). Use predicate when given a plist.
(map-put): Avoid gratuitous warnings when called without the hidden
predicate argument. Improve obsoletion message.
(map-put!): Use predicate when given a plist.
(map-contains-key): Ditto. Declare forgotten
advertised-calling-convention (bug#58531#19).
(map--put): Group definition in file together with that of map-put!.
* lisp/files-x.el (connection-local-normalize-criteria): Simplify
using mapcan + plist-get.
* lisp/net/eudc.el (eudc--plist-member): New convenience function.
(eudc-plist-member, eudc-plist-get, eudc-lax-plist-get): Use it
instead of open-coding plist-member.
* src/fns.c (Fplist_get, plist_get, Fplist_put, plist_put): Pass the
plist element as the first argument to the predicate, for
consistency with assoc + alist-get.
(Fplist_member, plist_member): Move from widget to plist section.
Open-code the EQ case in plist_member, and call it from
Fplist_member in that case, rather than the other way around.
* test/lisp/apropos-tests.el (apropos-tests-format-plist): Avoid
polluting obarray.
* test/lisp/emacs-lisp/cl-extra-tests.el (cl-getf): Extend test with
generalized variables, degenerate plists, and improper lists.
* test/lisp/emacs-lisp/gv-tests.el: Byte-compile file; in the
meantime bug#24402 seems to have been fixed or worked around.
(gv-setter-edebug): Inhibit printing messages.
(gv-plist-get): Avoid modifying constant literals. Also test with a
predicate argument.
* test/lisp/emacs-lisp/map-tests.el (with-maps-do): Simplify
docstring.
(test-map-elt-testfn): Rename...
(test-map-elt-testfn-alist): ...to this. Also test with a predicate
argument.
(test-map-elt-testfn-plist, test-map-elt-gv, test-map-elt-signature)
(test-map-put!-plist, test-map-put!-signature)
(test-map-contains-key-signature, test-map-plist-member)
(test-map-plist-put): New tests.
(test-map-contains-key-testfn): Also test with a predicate argument.
(test-map-setf-alist-overwrite-key, test-map-setf-plist-insert-key)
(test-map-setf-plist-overwrite-key): Avoid modifying constant
literals.
(test-hash-table-setf-insert-key)
(test-hash-table-setf-overwrite-key): Fix indentation.
(test-setf-map-with-function): Make test more precise.
* test/lisp/net/eudc-tests.el: New file.
* test/lisp/subr-tests.el (test-plistp): Extend test with circular
list.
* test/src/fns-tests.el (test-cycle-equal, test-cycle-nconc): Move
from plist section to circular list section.
(plist-put/odd-number-of-elements): Avoid modifying constant
literals.
(plist-member/improper-list): Simplify.
(test-plist): Move to plist section. Also test with a predicate
argument.
2022-08-20 16:32:33 +03:00
|
|
|
|
(should (equal plist '(x 3 y)))
|
2025-02-22 19:14:51 +01:00
|
|
|
|
(should (eq (incf (cl-getf plist 'y 10) 4) 14))
|
Audit some plist uses with new predicate argument
* doc/lispref/lists.texi (Plist Access): Improve description of
default predicate.
* lisp/emacs-lisp/cl-extra.el (cl-getf, cl--set-getf): Assume
plist-member always returns a cons.
* lisp/emacs-lisp/gv.el (plist-get): Support new optional predicate
argument (bug#47425#91).
* lisp/emacs-lisp/map.el: Bump minor version.
(map--dispatch): Remove now that bug#58563 is fixed. Break two
remaining uses out into corresponding cl-defmethods.
(map--plist-p): Add docstring.
(map--plist-has-predicate, map--plist-member-1, map--plist-member)
(map--plist-put-1, map--plist-put): New definitions for supporting
predicate argument backward compatibly.
(map-elt): Fix generalized variable getter under a
predicate (bug#58531). Use predicate when given a plist.
(map-put): Avoid gratuitous warnings when called without the hidden
predicate argument. Improve obsoletion message.
(map-put!): Use predicate when given a plist.
(map-contains-key): Ditto. Declare forgotten
advertised-calling-convention (bug#58531#19).
(map--put): Group definition in file together with that of map-put!.
* lisp/files-x.el (connection-local-normalize-criteria): Simplify
using mapcan + plist-get.
* lisp/net/eudc.el (eudc--plist-member): New convenience function.
(eudc-plist-member, eudc-plist-get, eudc-lax-plist-get): Use it
instead of open-coding plist-member.
* src/fns.c (Fplist_get, plist_get, Fplist_put, plist_put): Pass the
plist element as the first argument to the predicate, for
consistency with assoc + alist-get.
(Fplist_member, plist_member): Move from widget to plist section.
Open-code the EQ case in plist_member, and call it from
Fplist_member in that case, rather than the other way around.
* test/lisp/apropos-tests.el (apropos-tests-format-plist): Avoid
polluting obarray.
* test/lisp/emacs-lisp/cl-extra-tests.el (cl-getf): Extend test with
generalized variables, degenerate plists, and improper lists.
* test/lisp/emacs-lisp/gv-tests.el: Byte-compile file; in the
meantime bug#24402 seems to have been fixed or worked around.
(gv-setter-edebug): Inhibit printing messages.
(gv-plist-get): Avoid modifying constant literals. Also test with a
predicate argument.
* test/lisp/emacs-lisp/map-tests.el (with-maps-do): Simplify
docstring.
(test-map-elt-testfn): Rename...
(test-map-elt-testfn-alist): ...to this. Also test with a predicate
argument.
(test-map-elt-testfn-plist, test-map-elt-gv, test-map-elt-signature)
(test-map-put!-plist, test-map-put!-signature)
(test-map-contains-key-signature, test-map-plist-member)
(test-map-plist-put): New tests.
(test-map-contains-key-testfn): Also test with a predicate argument.
(test-map-setf-alist-overwrite-key, test-map-setf-plist-insert-key)
(test-map-setf-plist-overwrite-key): Avoid modifying constant
literals.
(test-hash-table-setf-insert-key)
(test-hash-table-setf-overwrite-key): Fix indentation.
(test-setf-map-with-function): Make test more precise.
* test/lisp/net/eudc-tests.el: New file.
* test/lisp/subr-tests.el (test-plistp): Extend test with circular
list.
* test/src/fns-tests.el (test-cycle-equal, test-cycle-nconc): Move
from plist section to circular list section.
(plist-put/odd-number-of-elements): Avoid modifying constant
literals.
(plist-member/improper-list): Simplify.
(test-plist): Move to plist section. Also test with a predicate
argument.
2022-08-20 16:32:33 +03:00
|
|
|
|
(should (equal plist '(y 14 x 3 y))))
|
|
|
|
|
|
(let ((plist '(x 1 y . 2)))
|
|
|
|
|
|
(should (eq (cl-getf plist 'x) 1))
|
2025-02-22 19:14:51 +01:00
|
|
|
|
(should (eq (incf (cl-getf plist 'x 10) 2) 3))
|
Audit some plist uses with new predicate argument
* doc/lispref/lists.texi (Plist Access): Improve description of
default predicate.
* lisp/emacs-lisp/cl-extra.el (cl-getf, cl--set-getf): Assume
plist-member always returns a cons.
* lisp/emacs-lisp/gv.el (plist-get): Support new optional predicate
argument (bug#47425#91).
* lisp/emacs-lisp/map.el: Bump minor version.
(map--dispatch): Remove now that bug#58563 is fixed. Break two
remaining uses out into corresponding cl-defmethods.
(map--plist-p): Add docstring.
(map--plist-has-predicate, map--plist-member-1, map--plist-member)
(map--plist-put-1, map--plist-put): New definitions for supporting
predicate argument backward compatibly.
(map-elt): Fix generalized variable getter under a
predicate (bug#58531). Use predicate when given a plist.
(map-put): Avoid gratuitous warnings when called without the hidden
predicate argument. Improve obsoletion message.
(map-put!): Use predicate when given a plist.
(map-contains-key): Ditto. Declare forgotten
advertised-calling-convention (bug#58531#19).
(map--put): Group definition in file together with that of map-put!.
* lisp/files-x.el (connection-local-normalize-criteria): Simplify
using mapcan + plist-get.
* lisp/net/eudc.el (eudc--plist-member): New convenience function.
(eudc-plist-member, eudc-plist-get, eudc-lax-plist-get): Use it
instead of open-coding plist-member.
* src/fns.c (Fplist_get, plist_get, Fplist_put, plist_put): Pass the
plist element as the first argument to the predicate, for
consistency with assoc + alist-get.
(Fplist_member, plist_member): Move from widget to plist section.
Open-code the EQ case in plist_member, and call it from
Fplist_member in that case, rather than the other way around.
* test/lisp/apropos-tests.el (apropos-tests-format-plist): Avoid
polluting obarray.
* test/lisp/emacs-lisp/cl-extra-tests.el (cl-getf): Extend test with
generalized variables, degenerate plists, and improper lists.
* test/lisp/emacs-lisp/gv-tests.el: Byte-compile file; in the
meantime bug#24402 seems to have been fixed or worked around.
(gv-setter-edebug): Inhibit printing messages.
(gv-plist-get): Avoid modifying constant literals. Also test with a
predicate argument.
* test/lisp/emacs-lisp/map-tests.el (with-maps-do): Simplify
docstring.
(test-map-elt-testfn): Rename...
(test-map-elt-testfn-alist): ...to this. Also test with a predicate
argument.
(test-map-elt-testfn-plist, test-map-elt-gv, test-map-elt-signature)
(test-map-put!-plist, test-map-put!-signature)
(test-map-contains-key-signature, test-map-plist-member)
(test-map-plist-put): New tests.
(test-map-contains-key-testfn): Also test with a predicate argument.
(test-map-setf-alist-overwrite-key, test-map-setf-plist-insert-key)
(test-map-setf-plist-overwrite-key): Avoid modifying constant
literals.
(test-hash-table-setf-insert-key)
(test-hash-table-setf-overwrite-key): Fix indentation.
(test-setf-map-with-function): Make test more precise.
* test/lisp/net/eudc-tests.el: New file.
* test/lisp/subr-tests.el (test-plistp): Extend test with circular
list.
* test/src/fns-tests.el (test-cycle-equal, test-cycle-nconc): Move
from plist section to circular list section.
(plist-put/odd-number-of-elements): Avoid modifying constant
literals.
(plist-member/improper-list): Simplify.
(test-plist): Move to plist section. Also test with a predicate
argument.
2022-08-20 16:32:33 +03:00
|
|
|
|
(should (equal plist '(x 3 y . 2)))
|
|
|
|
|
|
(should-error (cl-getf plist 'y :none) :type 'wrong-type-argument)
|
|
|
|
|
|
(should-error (cl-getf plist 'z :none) :type 'wrong-type-argument)))
|
2016-08-05 19:59:52 -04:00
|
|
|
|
|
2017-02-27 16:32:10 +09:00
|
|
|
|
(ert-deftest cl-extra-test-mapc ()
|
|
|
|
|
|
(let ((lst '(a b c))
|
|
|
|
|
|
(lst2 '(d e f))
|
|
|
|
|
|
(lst3 '(1 2 3))
|
|
|
|
|
|
(fn1 (lambda (_x) nil))
|
|
|
|
|
|
(fn2 (lambda (_x _y) nil))
|
|
|
|
|
|
(fn3 (lambda (_x _y _z) nil)))
|
|
|
|
|
|
(should (equal lst (cl-mapc fn1 lst)))
|
|
|
|
|
|
(should (equal lst (cl-mapc fn2 lst lst2)))
|
|
|
|
|
|
(should (equal lst (cl-mapc fn3 lst lst2 lst3)))))
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest cl-extra-test-mapl ()
|
|
|
|
|
|
(let ((lst '(a b c))
|
|
|
|
|
|
(lst2 '(d e f))
|
|
|
|
|
|
(lst3 '(1 2 3))
|
|
|
|
|
|
(fn1 (lambda (x) (should (consp x))))
|
|
|
|
|
|
(fn2 (lambda (x y) (should (and (consp x) (consp y)))))
|
|
|
|
|
|
(fn3 (lambda (x y z) (should (and (consp x) (consp y) (consp z))))))
|
|
|
|
|
|
(should (equal lst (cl-mapl fn1 lst)))
|
|
|
|
|
|
(should (equal lst (cl-mapl fn2 lst lst2)))
|
|
|
|
|
|
(should (equal lst (cl-mapl fn3 lst lst2 lst3)))))
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest cl-extra-test-mapcar ()
|
|
|
|
|
|
(let ((lst '(a b c))
|
|
|
|
|
|
(lst2 '(d e f))
|
|
|
|
|
|
(lst3 '(1 2 3))
|
|
|
|
|
|
(fn1 (lambda (x) x))
|
|
|
|
|
|
(fn2 (lambda (_x y) y))
|
|
|
|
|
|
(fn3 (lambda (_x _y z) z)))
|
|
|
|
|
|
(should (equal lst (cl-mapcar fn1 lst)))
|
|
|
|
|
|
(should (equal lst2 (cl-mapcar fn2 lst lst2)))
|
|
|
|
|
|
(should (equal lst3 (cl-mapcar fn3 lst lst2 lst3)))))
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest cl-extra-test-map ()
|
|
|
|
|
|
(let ((lst '(a b c))
|
|
|
|
|
|
(lst2 '(d e f))
|
|
|
|
|
|
(lst3 '(1 2 3))
|
|
|
|
|
|
(fn1 (lambda (x) x))
|
|
|
|
|
|
(fn2 (lambda (_x y) y))
|
|
|
|
|
|
(fn3 (lambda (x _y _z) (string-to-char (format "%S" x)))))
|
|
|
|
|
|
(should (equal lst (cl-map 'list fn1 lst)))
|
|
|
|
|
|
(should (equal (vconcat lst2) (cl-map 'vector fn2 lst lst2)))
|
2022-09-08 16:08:42 -04:00
|
|
|
|
(should (equal (mapconcat (lambda (x) (format "%S" x)) lst)
|
2017-02-27 16:32:10 +09:00
|
|
|
|
(cl-map 'string fn3 lst lst2 lst3)))))
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest cl-extra-test-maplist ()
|
|
|
|
|
|
(let ((lst '(a b c))
|
|
|
|
|
|
(lst2 '(d e f))
|
|
|
|
|
|
(lst3 '(1 2 3))
|
|
|
|
|
|
(fn1 (lambda (x) (should (consp x)) x))
|
|
|
|
|
|
(fn2 (lambda (x y) (should (and (consp x) (consp y))) y))
|
|
|
|
|
|
(fn3 (lambda (x y z) (should (and (consp x) (consp y) (consp z))) z)))
|
|
|
|
|
|
(should (equal (list lst (cdr lst) (cddr lst))
|
|
|
|
|
|
(cl-maplist fn1 lst)))
|
|
|
|
|
|
(should (equal (list lst2 (cdr lst2) (cddr lst2))
|
|
|
|
|
|
(cl-maplist fn2 lst lst2)))
|
|
|
|
|
|
(should (equal (list lst3 (cdr lst3) (cddr lst3))
|
|
|
|
|
|
(cl-maplist fn3 lst lst2 lst3)))))
|
|
|
|
|
|
|
2018-12-19 13:42:21 -08:00
|
|
|
|
(ert-deftest cl-extra-test-cl-make-random-state ()
|
|
|
|
|
|
(let ((s (cl-make-random-state)))
|
|
|
|
|
|
;; Test for Bug#33731.
|
|
|
|
|
|
(should-not (eq s (cl-make-random-state s)))))
|
|
|
|
|
|
|
2020-03-22 07:48:14 -04:00
|
|
|
|
(ert-deftest cl-concatenate ()
|
|
|
|
|
|
(should (equal (cl-concatenate 'list '(1 2 3) '(4 5 6))
|
|
|
|
|
|
'(1 2 3 4 5 6)))
|
|
|
|
|
|
(should (equal (cl-concatenate 'vector [1 2 3] [4 5 6])
|
|
|
|
|
|
[1 2 3 4 5 6]))
|
|
|
|
|
|
(should (equal (cl-concatenate 'string "123" "456")
|
Consolidate some cl-lib tests
For discussion, see bug#75633#16 and the following thread:
https://lists.gnu.org/r/emacs-devel/2025-02/msg00053.html
* test/lisp/emacs-lisp/cl-extra-tests.el (cl-lib-test-remprop)
(cl-lib-test-coerce-to-vector, cl-parse-integer): Move here from
cl-lib-tests.el.
(cl-extra-test-remprop): Remove duplicate test, folding body...
(cl-get): ...into this test.
(cl-extra-test-concatenate): Remove duplicate test, folding body...
(cl-concatenate): ...into this test.
* test/lisp/emacs-lisp/cl-lib-tests.el: Update historic commentary.
(cl-lib-test-remprop, cl-lib-test-coerce-to-vector)
(cl-parse-integer): Move to cl-extra-tests.el.
(cl-lib-test-remove-if-not, cl-lib-test-remove)
(cl-lib-test-set-functions, cl-lib-test-string-position)
(cl-lib-test-mismatch, cl-nset-difference): Move to cl-seq-tests.el.
(cl-lib-test-gensym, cl-lib-keyword-names-versus-values)
(cl-lib-empty-keyargs, mystruct, cl-lib-struct-accessors)
(cl-lib-struct-constructors, cl-lib-arglist-performance, cl-the)
(cl-flet-test, cl-lib-test-typep, cl-lib-symbol-macrolet)
(cl-lib-symbol-macrolet-4+5, cl-lib-symbol-macrolet-2)
(cl-lib-symbol-macrolet-hide, cl-lib-defstruct-record): Move to
cl-macs-tests.el.
(cl-lib-test-endp): Remove duplicate test, folding body into
cl-seq-endp-test.
(cl-lib-set-difference): Remove duplicate test, folding body into
cl-set-difference-test.
* test/lisp/emacs-lisp/cl-macs-tests.el: Do not require cl-macs and
pcase.
(mystruct, cl-lib-struct-accessors, cl-lib-struct-constructors)
(cl-lib-arglist-performance, cl-lib-defstruct-record)
(cl-lib-symbol-macrolet, cl-lib-symbol-macrolet-4+5)
(cl-lib-symbol-macrolet-2, cl-lib-symbol-macrolet-hide, cl-flet-test)
(cl-lib-keyword-names-versus-values, cl-lib-empty-keyargs)
(cl-lib-test-gensym, cl-the, cl-lib-test-typep): Move here from
cl-lib-tests.el.
(cl-case-error, cl-case-warning): Fix indentation.
* test/lisp/emacs-lisp/cl-seq-tests.el: Require cl-lib rather than
cl-seq.
(cl-seq-endp-test): Absorb body of cl-lib-test-endp.
(cl-lib-test-remove, cl-lib-test-remove-if-not)
(cl-lib-test-string-position, cl-lib-test-mismatch)
(cl-lib-test-set-functions, cl-nset-difference): Move here from
cl-lib-tests.el.
(cl-set-difference-test): Absorb body of cl-lib-set-difference.
2025-02-02 17:18:52 +01:00
|
|
|
|
"123456"))
|
|
|
|
|
|
(should (equal (cl-concatenate 'list '(1 2) '(3 4) '(5 6)) '(1 2 3 4 5 6))))
|
2020-03-22 07:48:14 -04:00
|
|
|
|
|
2025-01-17 09:48:57 -05:00
|
|
|
|
(ert-deftest cl-extra-test-mapcan ()
|
|
|
|
|
|
(should (equal (cl-mapcan #'list '(1 2 3)) '(1 2 3)))
|
|
|
|
|
|
(should (equal (cl-mapcan #'list '(1 2 3) '(4 5 6)) '(1 4 2 5 3 6)))
|
|
|
|
|
|
(should (equal (cl-mapcan #'list '(1 2) '(3 4 5)) '(1 3 2 4)))
|
|
|
|
|
|
(should (equal (cl-mapcan #'list '(1 2 3) "#$%") '(1 ?# 2 ?$ 3 ?%)))
|
|
|
|
|
|
(should (equal (cl-mapcan #'list '()) '()))
|
|
|
|
|
|
(should (equal (cl-mapcan #'list '() '()) '())))
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest cl-extra-test-mapcon ()
|
|
|
|
|
|
(should (equal (cl-mapcon #'list '(1 2 3)) '((1 2 3) (2 3) (3))))
|
|
|
|
|
|
(should (equal (cl-mapcon #'list '()) nil))
|
|
|
|
|
|
(should (equal (cl-mapcon #'list '() '()) nil)))
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest cl-extra-test-some ()
|
|
|
|
|
|
(should (equal (cl-some #'identity (list nil nil "foo")) "foo"))
|
|
|
|
|
|
(should (equal (cl-some #'identity [nil nil nil]) nil))
|
|
|
|
|
|
(should (equal (cl-some (lambda (a b) (> (+ a b) 198)) (list ?a ?b ?c) "abcz") nil))
|
|
|
|
|
|
(should (equal (cl-some (lambda (a b) (> (+ a b) 198)) (list ?a ?b ?c) "abz") t)))
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest cl-extra-test-every ()
|
|
|
|
|
|
(should (equal (cl-every #'identity (list t 42 "foo")) t))
|
|
|
|
|
|
(should (equal (cl-every #'identity [t nil "foo"]) nil))
|
|
|
|
|
|
(should (equal (cl-every (lambda (a b) (<= (+ a b) 198))
|
|
|
|
|
|
(list ?a ?b ?c) "abcz")
|
|
|
|
|
|
t))
|
|
|
|
|
|
(should (equal (cl-every (lambda (a b) (<= (+ a b) 198))
|
|
|
|
|
|
(list ?a ?b ?c) "abz")
|
|
|
|
|
|
nil)))
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest cl-extra-test-notany ()
|
Prefer oddp/evenp to cl-oddp/cl-evenp
* lisp/calc/calc-ext.el (math-oddp):
* lisp/calc/calc-misc.el (math-evenp):
* lisp/calendar/todo-mode.el
(todo-adjusted-category-label-length, todo-insert-category-line)
(todo-update-categories-display):
* lisp/emacs-lisp/cl-macs.el (cl-defstruct):
* lisp/net/gnutls.el (open-gnutls-stream):
* lisp/tab-line.el (tab-line-tab-face-inactive-alternating):
* test/lisp/auth-source-tests.el
(auth-source-test-macos-keychain-search):
* test/lisp/emacs-lisp/cl-extra-tests.el (cl-extra-test-notany)
(cl-extra-test-notevery):
* test/lisp/emacs-lisp/cl-lib-tests.el (cl-lib-adjoin-test):
* test/lisp/emacs-lisp/cl-macs-tests.el (cl-macs-loop-collect)
(cl-macs-loop-append/nconc, cl-macs-loop-when)
(cl-macs-loop-if):
* test/lisp/emacs-lisp/cl-seq-tests.el (cl-seq-remove-test)
(cl-remove-if-test, cl-remove-if-not-test, cl-seq-delete-test)
(cl-delete-if-test, cl-delete-if-not-test)
(cl-seq-substitute-if-test, cl-seq-substitute-if-not-test)
(cl-find-if-test, cl-find-if-not-test, cl-position-if-test)
(cl-seq-count-test, cl-count-if-test, cl-count-if-not-test)
(cl-member-if-test, cl-member-if-not-test, cl-assoc-if-test)
(cl-assoc-if-not-test, cl-rassoc-if-test)
(cl-rassoc-if-not-test):
* test/src/treesit-tests.el (treesit-search-forward-predicate):
Prefer oddp/evenp to cl-oddp/cl-evenp where possible.
* lisp/calc/calc-ext.el (cl-lib):
* lisp/calc/calc-misc.el (cl-lib): Don't require.
2025-02-17 03:33:54 +01:00
|
|
|
|
(should (equal (cl-notany #'oddp '(1 3 5)) nil))
|
|
|
|
|
|
(should (equal (cl-notany #'oddp '(2 4 6)) t))
|
|
|
|
|
|
(should (equal (cl-notany #'oddp '(1 2 3 4 5)) nil)))
|
2025-01-17 09:48:57 -05:00
|
|
|
|
|
|
|
|
|
|
(ert-deftest cl-extra-test-notevery ()
|
Prefer oddp/evenp to cl-oddp/cl-evenp
* lisp/calc/calc-ext.el (math-oddp):
* lisp/calc/calc-misc.el (math-evenp):
* lisp/calendar/todo-mode.el
(todo-adjusted-category-label-length, todo-insert-category-line)
(todo-update-categories-display):
* lisp/emacs-lisp/cl-macs.el (cl-defstruct):
* lisp/net/gnutls.el (open-gnutls-stream):
* lisp/tab-line.el (tab-line-tab-face-inactive-alternating):
* test/lisp/auth-source-tests.el
(auth-source-test-macos-keychain-search):
* test/lisp/emacs-lisp/cl-extra-tests.el (cl-extra-test-notany)
(cl-extra-test-notevery):
* test/lisp/emacs-lisp/cl-lib-tests.el (cl-lib-adjoin-test):
* test/lisp/emacs-lisp/cl-macs-tests.el (cl-macs-loop-collect)
(cl-macs-loop-append/nconc, cl-macs-loop-when)
(cl-macs-loop-if):
* test/lisp/emacs-lisp/cl-seq-tests.el (cl-seq-remove-test)
(cl-remove-if-test, cl-remove-if-not-test, cl-seq-delete-test)
(cl-delete-if-test, cl-delete-if-not-test)
(cl-seq-substitute-if-test, cl-seq-substitute-if-not-test)
(cl-find-if-test, cl-find-if-not-test, cl-position-if-test)
(cl-seq-count-test, cl-count-if-test, cl-count-if-not-test)
(cl-member-if-test, cl-member-if-not-test, cl-assoc-if-test)
(cl-assoc-if-not-test, cl-rassoc-if-test)
(cl-rassoc-if-not-test):
* test/src/treesit-tests.el (treesit-search-forward-predicate):
Prefer oddp/evenp to cl-oddp/cl-evenp where possible.
* lisp/calc/calc-ext.el (cl-lib):
* lisp/calc/calc-misc.el (cl-lib): Don't require.
2025-02-17 03:33:54 +01:00
|
|
|
|
(should (equal (cl-notevery #'oddp '(1 3 5)) nil))
|
|
|
|
|
|
(should (equal (cl-notevery #'oddp '(2 4 6)) t))
|
|
|
|
|
|
(should (equal (cl-notevery #'oddp '(1 2 3 4 5)) t)))
|
2025-01-17 09:48:57 -05:00
|
|
|
|
|
|
|
|
|
|
(ert-deftest cl-extra-test-gcd ()
|
|
|
|
|
|
(should (equal (cl-gcd 4) 4))
|
|
|
|
|
|
(should (equal (cl-gcd 3 5) 1))
|
|
|
|
|
|
(should (equal (cl-gcd 4 8) 4))
|
|
|
|
|
|
(should (equal (cl-gcd 3 5 7) 1))
|
|
|
|
|
|
(should (equal (cl-gcd 4 8 12) 4))
|
|
|
|
|
|
(should (equal (cl-gcd 0) 0))
|
|
|
|
|
|
(should (equal (cl-gcd 4 0) 4))
|
|
|
|
|
|
(should (equal (cl-gcd 0 0) 0)))
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest cl-extra-test-lcm ()
|
|
|
|
|
|
(should (equal (cl-lcm 4) 4))
|
|
|
|
|
|
(should (equal (cl-lcm 3 5) 15))
|
|
|
|
|
|
(should (equal (cl-lcm 4 8) 8))
|
|
|
|
|
|
(should (equal (cl-lcm 3 5 7) 105))
|
|
|
|
|
|
(should (equal (cl-lcm 4 8 12) 24))
|
|
|
|
|
|
(should (equal (cl-lcm 0 4) 0))
|
|
|
|
|
|
(should (equal (cl-lcm 0 0) 0))
|
|
|
|
|
|
(should (equal (cl-lcm) 1)))
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest cl-extra-test-isqrt ()
|
|
|
|
|
|
(should (equal (cl-isqrt 4) 2))
|
|
|
|
|
|
(should (equal (cl-isqrt 100) 10))
|
|
|
|
|
|
(should (equal (cl-isqrt 1) 1))
|
|
|
|
|
|
(should (equal (cl-isqrt 0) 0))
|
|
|
|
|
|
(should (equal (cl-isqrt 3) 1))
|
|
|
|
|
|
(should (equal (cl-isqrt 10) 3))
|
2025-02-02 17:24:14 +01:00
|
|
|
|
(should-error (cl-isqrt -4) :type 'arith-error)
|
|
|
|
|
|
(should-error (cl-isqrt 2.5) :type 'arith-error))
|
2025-01-17 09:48:57 -05:00
|
|
|
|
|
|
|
|
|
|
(ert-deftest cl-extra-test-floor ()
|
|
|
|
|
|
(should (equal (cl-floor 4.5) '(4 0.5)))
|
|
|
|
|
|
(should (equal (cl-floor 10 3) '(3 1))))
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest cl-extra-test-ceiling ()
|
|
|
|
|
|
(should (equal (cl-ceiling 4.5) '(5 -0.5)))
|
|
|
|
|
|
(should (equal (cl-ceiling 10 3) '(4 -2))))
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest cl-extra-test-truncate ()
|
|
|
|
|
|
(should (equal (cl-truncate 4.5) '(4 0.5)))
|
|
|
|
|
|
(should (equal (cl-truncate 10 3) '(3 1))))
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest cl-extra-test-round ()
|
|
|
|
|
|
(should (equal (cl-round 4.5) '(4 0.5)))
|
|
|
|
|
|
(should (equal (cl-round 10 3) '(3 1)))
|
|
|
|
|
|
(should (equal (cl-round 1.5) '(2 -0.5)))
|
|
|
|
|
|
(should (equal (cl-round 2.5) '(2 0.5))))
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest cl-extra-test-mod ()
|
|
|
|
|
|
(should (equal (cl-mod 10 3) 1))
|
|
|
|
|
|
(should (equal (cl-mod -10 -3) -1))
|
|
|
|
|
|
(should (equal (cl-mod -10 3) 2))
|
|
|
|
|
|
(should (equal (cl-mod 10 -3) -2)))
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest cl-extra-test-rem ()
|
|
|
|
|
|
(should (equal (cl-rem 10 3) 1))
|
|
|
|
|
|
(should (equal (cl-rem -10 -3) -1))
|
|
|
|
|
|
(should (equal (cl-rem -10 3) -1))
|
|
|
|
|
|
(should (equal (cl-rem 10 -3) 1)))
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest cl-extra-test-signum ()
|
|
|
|
|
|
(should (equal (cl-signum 10) 1))
|
|
|
|
|
|
(should (equal (cl-signum -10) -1))
|
|
|
|
|
|
(should (equal (cl-signum 0) 0)))
|
|
|
|
|
|
|
Consolidate some cl-lib tests
For discussion, see bug#75633#16 and the following thread:
https://lists.gnu.org/r/emacs-devel/2025-02/msg00053.html
* test/lisp/emacs-lisp/cl-extra-tests.el (cl-lib-test-remprop)
(cl-lib-test-coerce-to-vector, cl-parse-integer): Move here from
cl-lib-tests.el.
(cl-extra-test-remprop): Remove duplicate test, folding body...
(cl-get): ...into this test.
(cl-extra-test-concatenate): Remove duplicate test, folding body...
(cl-concatenate): ...into this test.
* test/lisp/emacs-lisp/cl-lib-tests.el: Update historic commentary.
(cl-lib-test-remprop, cl-lib-test-coerce-to-vector)
(cl-parse-integer): Move to cl-extra-tests.el.
(cl-lib-test-remove-if-not, cl-lib-test-remove)
(cl-lib-test-set-functions, cl-lib-test-string-position)
(cl-lib-test-mismatch, cl-nset-difference): Move to cl-seq-tests.el.
(cl-lib-test-gensym, cl-lib-keyword-names-versus-values)
(cl-lib-empty-keyargs, mystruct, cl-lib-struct-accessors)
(cl-lib-struct-constructors, cl-lib-arglist-performance, cl-the)
(cl-flet-test, cl-lib-test-typep, cl-lib-symbol-macrolet)
(cl-lib-symbol-macrolet-4+5, cl-lib-symbol-macrolet-2)
(cl-lib-symbol-macrolet-hide, cl-lib-defstruct-record): Move to
cl-macs-tests.el.
(cl-lib-test-endp): Remove duplicate test, folding body into
cl-seq-endp-test.
(cl-lib-set-difference): Remove duplicate test, folding body into
cl-set-difference-test.
* test/lisp/emacs-lisp/cl-macs-tests.el: Do not require cl-macs and
pcase.
(mystruct, cl-lib-struct-accessors, cl-lib-struct-constructors)
(cl-lib-arglist-performance, cl-lib-defstruct-record)
(cl-lib-symbol-macrolet, cl-lib-symbol-macrolet-4+5)
(cl-lib-symbol-macrolet-2, cl-lib-symbol-macrolet-hide, cl-flet-test)
(cl-lib-keyword-names-versus-values, cl-lib-empty-keyargs)
(cl-lib-test-gensym, cl-the, cl-lib-test-typep): Move here from
cl-lib-tests.el.
(cl-case-error, cl-case-warning): Fix indentation.
* test/lisp/emacs-lisp/cl-seq-tests.el: Require cl-lib rather than
cl-seq.
(cl-seq-endp-test): Absorb body of cl-lib-test-endp.
(cl-lib-test-remove, cl-lib-test-remove-if-not)
(cl-lib-test-string-position, cl-lib-test-mismatch)
(cl-lib-test-set-functions, cl-nset-difference): Move here from
cl-lib-tests.el.
(cl-set-difference-test): Absorb body of cl-lib-set-difference.
2025-02-02 17:18:52 +01:00
|
|
|
|
(ert-deftest cl-parse-integer ()
|
|
|
|
|
|
(should-error (cl-parse-integer "abc"))
|
|
|
|
|
|
(should (null (cl-parse-integer "abc" :junk-allowed t)))
|
|
|
|
|
|
(should (null (cl-parse-integer "" :junk-allowed t)))
|
|
|
|
|
|
(should (= 342391 (cl-parse-integer "0123456789" :radix 8 :junk-allowed t)))
|
|
|
|
|
|
(should-error (cl-parse-integer "0123456789" :radix 8))
|
|
|
|
|
|
(should (= -239 (cl-parse-integer "-efz" :radix 16 :junk-allowed t)))
|
|
|
|
|
|
(should-error (cl-parse-integer "efz" :radix 16))
|
|
|
|
|
|
(should (= 239 (cl-parse-integer "zzef" :radix 16 :start 2)))
|
|
|
|
|
|
(should (= -123 (cl-parse-integer " -123 "))))
|
|
|
|
|
|
|
2025-01-17 09:48:57 -05:00
|
|
|
|
(ert-deftest cl-extra-test-parse-integer ()
|
|
|
|
|
|
(should (equal (cl-parse-integer "10") 10))
|
|
|
|
|
|
(should (equal (cl-parse-integer "-10") -10))
|
|
|
|
|
|
(should (equal (cl-parse-integer "+10") 10))
|
|
|
|
|
|
(should (equal (cl-parse-integer "ff" :radix 16) 255))
|
|
|
|
|
|
(should (equal (cl-parse-integer "11" :start 1) 1))
|
|
|
|
|
|
(should (equal (cl-parse-integer "abc def" :end 3 :junk-allowed t) nil)))
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest cl-extra-test-subseq ()
|
|
|
|
|
|
(should (equal (cl-subseq "hello" 1) "ello"))
|
|
|
|
|
|
(should (equal (cl-subseq "hello" 1 4) "ell"))
|
|
|
|
|
|
(should (equal (cl-subseq "hello" -1) "o"))
|
|
|
|
|
|
(should (equal (cl-subseq "hello world" -5 -1) "worl"))
|
|
|
|
|
|
(should (equal (cl-subseq '(1 2 3 4 5) 2) '(3 4 5)))
|
|
|
|
|
|
(should (equal (cl-subseq '(1 2 3 4 5) 1 3) '(2 3))))
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest cl-extra-test-revappend ()
|
|
|
|
|
|
(should (equal (cl-revappend '(1 2 3) '(4 5 6)) '(3 2 1 4 5 6))))
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest cl-extra-test-nreconc ()
|
2025-02-02 17:24:14 +01:00
|
|
|
|
(should (equal (cl-nreconc (list 1 2 3) '(4 5 6)) '(3 2 1 4 5 6))))
|
2025-01-17 09:48:57 -05:00
|
|
|
|
|
|
|
|
|
|
(ert-deftest cl-extra-test-list-length ()
|
|
|
|
|
|
(should (equal (cl-list-length '(1 2 3)) 3))
|
|
|
|
|
|
(should (equal (cl-list-length '()) 0))
|
|
|
|
|
|
(let ((xl (number-sequence 1 100)))
|
2025-02-02 17:24:14 +01:00
|
|
|
|
(nconc xl xl)
|
2025-01-17 09:48:57 -05:00
|
|
|
|
(should (equal (cl-list-length xl) nil))))
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest cl-extra-test-tailp ()
|
|
|
|
|
|
(let ((l '(1 2 3 4 5)))
|
|
|
|
|
|
(should (cl-tailp (nthcdr 2 l) l))
|
|
|
|
|
|
(should (cl-tailp l l))
|
|
|
|
|
|
(should (not (cl-tailp '(4 5) l)))))
|
|
|
|
|
|
|
2016-08-05 19:59:52 -04:00
|
|
|
|
;;; cl-extra-tests.el ends here
|