summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Petton <nicolas@petton.fr>2015-11-11 18:09:42 +0100
committerNicolas Petton <nicolas@petton.fr>2015-11-11 18:09:42 +0100
commit23036bac7d470397f364d02eb992d701f1ebab4b (patch)
treebb21bbf4afe84cb764565be006ef9084768d5a4a
parent20aea4293439281570c5c05d3f54bc5b261a4d0f (diff)
downloademacs-23036bac7d470397f364d02eb992d701f1ebab4b.tar.gz
Rename obarray-p to obarrayp
* lisp/obarray.el (obarrayp): New name. * test/automated/obarray-tests.el: Update the tests.
-rw-r--r--lisp/obarray.el2
-rw-r--r--test/automated/obarray-tests.el22
2 files changed, 12 insertions, 12 deletions
diff --git a/lisp/obarray.el b/lisp/obarray.el
index 0e57381a9c5..bf8bb3ee2ca 100644
--- a/lisp/obarray.el
+++ b/lisp/obarray.el
@@ -37,7 +37,7 @@
(make-vector size 0)
(signal 'wrong-type-argument '(size 0)))))
-(defun obarray-p (object)
+(defun obarrayp (object)
"Return t if OBJECT is an obarray."
(and (vectorp object)
(< 0 (length object))))
diff --git a/test/automated/obarray-tests.el b/test/automated/obarray-tests.el
index 97df3b3b6a6..4cc61b6903f 100644
--- a/test/automated/obarray-tests.el
+++ b/test/automated/obarray-tests.el
@@ -26,30 +26,30 @@
(require 'obarray)
(require 'ert)
-(ert-deftest obarray-p-test ()
+(ert-deftest obarrayp-test ()
"Should assert that given object is an obarray."
- (should-not (obarray-p 42))
- (should-not (obarray-p "aoeu"))
- (should-not (obarray-p '()))
- (should-not (obarray-p []))
- (should (obarray-p (make-vector 7 0))))
+ (should-not (obarrayp 42))
+ (should-not (obarrayp "aoeu"))
+ (should-not (obarrayp '()))
+ (should-not (obarrayp []))
+ (should (obarrayp (make-vector 7 0))))
-(ert-deftest obarray-p-unchecked-content-test ()
+(ert-deftest obarrayp-unchecked-content-test ()
"Should fail to check content of passed obarray."
:expected-result :failed
- (should-not (obarray-p ["a" "b" "c"]))
- (should-not (obarray-p [1 2 3])))
+ (should-not (obarrayp ["a" "b" "c"]))
+ (should-not (obarrayp [1 2 3])))
(ert-deftest obarray-make-default-test ()
(let ((table (obarray-make)))
- (should (obarray-p table))
+ (should (obarrayp table))
(should (equal (make-vector 59 0) table))))
(ert-deftest obarray-make-with-size-test ()
(should-error (obarray-make -1) :type 'wrong-type-argument)
(should-error (obarray-make 0) :type 'wrong-type-argument)
(let ((table (obarray-make 1)))
- (should (obarray-p table))
+ (should (obarrayp table))
(should (equal (make-vector 1 0) table))))
(ert-deftest obarray-get-test ()