Rename map-contains-key-p and map-some-p

[gnu-emacs] / test / automated / map-tests.el

diff --git a/test/automated/map-tests.el b/test/automated/map-tests.el
index 1f3a07e3f3bba8a601276b87960b12176156ac5a..ca680041944e8fa440f6eefbf8e4decd69d79002 100644 (file)
--- a/test/automated/map-tests.el
+++ b/test/automated/map-tests.el
@@ -252,29 +252,29 @@ Evaluate BODY for each created map.
   (should (not (map-empty-p "hello")))
   (should (map-empty-p "")))
 
-(ert-deftest test-map-contains-key-p ()
-  (should (map-contains-key-p '((a . 1) (b . 2)) 'a))
-  (should (not (map-contains-key-p '((a . 1) (b . 2)) 'c)))
-  (should (map-contains-key-p '(("a" . 1)) "a"))
-  (should (not (map-contains-key-p '(("a" . 1)) "a" #'eq)))
-  (should (map-contains-key-p [a b c] 2))
-  (should (not (map-contains-key-p [a b c] 3))))
-
-(ert-deftest test-map-some-p ()
+(ert-deftest test-map-contains-key ()
+  (should (map-contains-key '((a . 1) (b . 2)) 'a))
+  (should (not (map-contains-key '((a . 1) (b . 2)) 'c)))
+  (should (map-contains-key '(("a" . 1)) "a"))
+  (should (not (map-contains-key '(("a" . 1)) "a" #'eq)))
+  (should (map-contains-key [a b c] 2))
+  (should (not (map-contains-key [a b c] 3))))
+
+(ert-deftest test-map-some ()
   (with-maps-do map
-    (should (equal (map-some-p (lambda (k _v)
+    (should (equal (map-some (lambda (k _v)
                                  (eq 1 k))
                                map)
                    (cons 1 4)))
-    (should (not (map-some-p (lambda (k _v)
+    (should (not (map-some (lambda (k _v)
                                (eq 'd k))
                              map))))
   (let ((vec [a b c]))
-    (should (equal (map-some-p (lambda (k _v)
+    (should (equal (map-some (lambda (k _v)
                                  (> k 1))
                                vec)
                    (cons 2 'c)))
-    (should (not (map-some-p (lambda (k _v)
+    (should (not (map-some (lambda (k _v)
                                (> k 3))
                              vec)))))