summaryrefslogtreecommitdiff
path: root/test/lisp/emacs-lisp
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2016-09-24 12:30:22 +0300
committerEli Zaretskii <eliz@gnu.org>2016-09-24 12:30:22 +0300
commit0cba34447768b7aa5c8bd05128b17541a43e980d (patch)
tree7070074d3cd1cb66e58569690ed19a750f259a74 /test/lisp/emacs-lisp
parent2f4776bf321bcd9c92a0f979f5a0544b76f3cba5 (diff)
downloademacs-0cba34447768b7aa5c8bd05128b17541a43e980d.tar.gz
emacs-0cba34447768b7aa5c8bd05128b17541a43e980d.tar.bz2
emacs-0cba34447768b7aa5c8bd05128b17541a43e980d.zip
Incorporate core-elisp-tests in lisp-tests
* test/lisp/emacs-lisp/lisp-tests.el: Added tests from test/lisp/legacy/core-elisp-tests.el. * test/lisp/legacy/core-elisp-tests.el: File removed.
Diffstat (limited to 'test/lisp/emacs-lisp')
-rw-r--r--test/lisp/emacs-lisp/lisp-tests.el29
1 files changed, 29 insertions, 0 deletions
diff --git a/test/lisp/emacs-lisp/lisp-tests.el b/test/lisp/emacs-lisp/lisp-tests.el
index 4fe20f06e9d..d83f4a052cb 100644
--- a/test/lisp/emacs-lisp/lisp-tests.el
+++ b/test/lisp/emacs-lisp/lisp-tests.el
@@ -3,6 +3,7 @@
;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
;; Author: Aaron S. Hawley <aaron.s.hawley@gmail.com>
+;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
;; Keywords: internal
;; GNU Emacs is free software: you can redistribute it and/or modify
@@ -207,5 +208,33 @@
(goto-char (point-min))
(should-error (forward-sexp)))) ;; FIXME: Shouldn't be an error.
+;; Test some core Elisp rules.
+(ert-deftest core-elisp-tests-1-defvar-in-let ()
+ "Test some core Elisp rules."
+ (with-temp-buffer
+ ;; Check that when defvar is run within a let-binding, the toplevel default
+ ;; is properly initialized.
+ (should (equal (list (let ((c-e-x 1)) (defvar c-e-x 2) c-e-x) c-e-x)
+ '(1 2)))
+ (should (equal (list (let ((c-e-x 1))
+ (defcustom c-e-x 2 "doc" :group 'blah :type 'integer) c-e-x)
+ c-e-x)
+ '(1 2)))))
+
+(ert-deftest core-elisp-tests-2-window-configurations ()
+ "Test properties of window-configurations."
+ (let ((wc (current-window-configuration)))
+ (with-current-buffer (window-buffer (frame-selected-window))
+ (push-mark)
+ (activate-mark))
+ (set-window-configuration wc)
+ (should (or (not mark-active) (mark)))))
+
+(ert-deftest core-elisp-tests-3-backquote ()
+ (should (eq 3 (eval ``,,'(+ 1 2)))))
+
+(provide 'core-elisp-tests)
+;;; core-elisp-tests.el ends here
+
(provide 'lisp-tests)
;;; lisp-tests.el ends here