[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 0cba344: Incorporate core-elisp-tests in lisp-tests
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] master 0cba344: Incorporate core-elisp-tests in lisp-tests |
Date: |
Sat, 24 Sep 2016 09:31:26 +0000 (UTC) |
branch: master
commit 0cba34447768b7aa5c8bd05128b17541a43e980d
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
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.
---
test/lisp/emacs-lisp/lisp-tests.el | 29 +++++++++++++++++++
test/lisp/legacy/core-elisp-tests.el | 52 ----------------------------------
2 files changed, 29 insertions(+), 52 deletions(-)
diff --git a/test/lisp/emacs-lisp/lisp-tests.el
b/test/lisp/emacs-lisp/lisp-tests.el
index 4fe20f0..d83f4a0 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 <address@hidden>
+;; Author: Stefan Monnier <address@hidden>
;; 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
diff --git a/test/lisp/legacy/core-elisp-tests.el
b/test/lisp/legacy/core-elisp-tests.el
deleted file mode 100644
index b44bb37..0000000
--- a/test/lisp/legacy/core-elisp-tests.el
+++ /dev/null
@@ -1,52 +0,0 @@
-;;; core-elisp-tests.el --- Testing some core Elisp rules
-
-;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
-
-;; Author: Stefan Monnier <address@hidden>
-;; Keywords:
-
-;; This program 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.
-
-;; This program 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.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;;
-
-;;; Code:
-
-(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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 0cba344: Incorporate core-elisp-tests in lisp-tests,
Eli Zaretskii <=