>From 82399337d891f8c078b78f0de013ba240d1fc236 Mon Sep 17 00:00:00 2001 From: "Basil L. Contovounesios" Date: Tue, 9 Apr 2019 17:05:27 +0100 Subject: [PATCH 2/2] Move proper-list-p tests to fns-tests.el This follows the move of proper-list-p from lisp/subr.el to src/fns.c in 2018-07-24T15:58:46-07:address@hidden * test/lisp/subr-tests.el (subr-tests--proper-list-p): Move from here... * test/src/fns-tests.el (test-proper-list-p): ...to here. --- test/lisp/subr-tests.el | 18 ------------------ test/src/fns-tests.el | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/test/lisp/subr-tests.el b/test/lisp/subr-tests.el index 7465aac5ea..c458eef2f9 100644 --- a/test/lisp/subr-tests.el +++ b/test/lisp/subr-tests.el @@ -318,24 +318,6 @@ subr-test--frames-1 (should (eq (string-to-char (symbol-name (gensym))) ?g)) (should (eq (string-to-char (symbol-name (gensym "X"))) ?X))) -(ert-deftest subr-tests--proper-list-p () - "Test `proper-list-p' behavior." - (dotimes (length 4) - ;; Proper and dotted lists. - (let ((list (make-list length 0))) - (should (= (proper-list-p list) length)) - (should (not (proper-list-p (nconc list 0))))) - ;; Circular lists. - (dotimes (n (1+ length)) - (let ((circle (make-list (1+ length) 0))) - (should (not (proper-list-p (nconc circle (nthcdr n circle)))))))) - ;; Atoms. - (should (not (proper-list-p 0))) - (should (not (proper-list-p ""))) - (should (not (proper-list-p []))) - (should (not (proper-list-p (make-bool-vector 0 nil)))) - (should (not (proper-list-p (make-symbol "a"))))) - (ert-deftest subr-tests--assq-delete-all () "Test `assq-delete-all' behavior." (cl-flet ((new-list-fn diff --git a/test/src/fns-tests.el b/test/src/fns-tests.el index d6cc99e8e3..6ebab4287f 100644 --- a/test/src/fns-tests.el +++ b/test/src/fns-tests.el @@ -648,4 +648,22 @@ dot2 (should (equal (list (eq a b) n len) (list t n len)))))))) +(ert-deftest test-proper-list-p () + "Test `proper-list-p' behavior." + (dotimes (length 4) + ;; Proper and dotted lists. + (let ((list (make-list length 0))) + (should (= (proper-list-p list) length)) + (should (not (proper-list-p (nconc list 0))))) + ;; Circular lists. + (dotimes (n (1+ length)) + (let ((circle (make-list (1+ length) 0))) + (should (not (proper-list-p (nconc circle (nthcdr n circle)))))))) + ;; Atoms. + (should (not (proper-list-p 0))) + (should (not (proper-list-p ""))) + (should (not (proper-list-p []))) + (should (not (proper-list-p (make-bool-vector 0 nil)))) + (should (not (proper-list-p (make-symbol "a"))))) + (provide 'fns-tests) -- 2.20.1