[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 4bdc037 1/2: Revert "Temporarily comment out CC Mod
From: |
João Távora |
Subject: |
[Emacs-diffs] master 4bdc037 1/2: Revert "Temporarily comment out CC Mode from tests..." |
Date: |
Thu, 17 Jan 2019 13:49:33 -0500 (EST) |
branch: master
commit 4bdc03746915c36313b33b6998b855eef514cdd1
Author: João Távora <address@hidden>
Commit: João Távora <address@hidden>
Revert "Temporarily comment out CC Mode from tests..."
This reverts commit 54f297904e0c641fcfd81f16e9a87177124a27be.
---
test/lisp/electric-tests.el | 64 +++++++++++++++++++++------------------------
1 file changed, 30 insertions(+), 34 deletions(-)
diff --git a/test/lisp/electric-tests.el b/test/lisp/electric-tests.el
index 86d0daa..5a4b20e 100644
--- a/test/lisp/electric-tests.el
+++ b/test/lisp/electric-tests.el
@@ -157,8 +157,7 @@ The buffer's contents should %s:
expected-string
expected-point
bindings
- (modes '(quote (ruby-mode ;; c++-mode
- )))
+ (modes '(quote (ruby-mode c++-mode)))
(test-in-comments t)
(test-in-strings t)
(test-in-code t)
@@ -397,10 +396,10 @@ baz\"\""
;; mode will sort this out eventually, using some new e-p-m machinery.
;; See
;; https://lists.gnu.org/archive/html/emacs-devel/2018-06/msg00535.html
-;; (setf
-;; (ert-test-expected-result-type
-;; (ert-get-test
'electric-pair-whitespace-chomping-2-at-point-4-in-c++-mode-in-strings))
-;; :failed)
+(setf
+ (ert-test-expected-result-type
+ (ert-get-test
'electric-pair-whitespace-chomping-2-at-point-4-in-c++-mode-in-strings))
+ :failed)
(define-electric-pair-test whitespace-chomping-dont-cross-comments
" ( \n\t\t\n ) " "--)------" :expected-string " () \n\t\t\n ) "
@@ -816,34 +815,31 @@ baz\"\""
;;; tests for `electric-layout-mode'
-;; Tests commented out, since C Mode does not use
-;; electric-layout-mode. 2019-01-17, ACM
-
-;; (ert-deftest electric-layout-int-main-kernel-style ()
-;; (ert-with-test-buffer ()
-;; (c-mode)
-;; (electric-layout-local-mode 1)
-;; (electric-pair-local-mode 1)
-;; (electric-indent-local-mode 1)
-;; (setq-local electric-layout-rules
-;; '((?\{ . (after-stay after))))
-;; (insert "int main () ")
-;; (let ((last-command-event ?\{))
-;; (call-interactively (key-binding `[,last-command-event])))
-;; (should (equal (buffer-string) "int main () {\n \n}"))))
-
-;; (ert-deftest electric-layout-int-main-allman-style ()
-;; (ert-with-test-buffer ()
-;; (c-mode)
-;; (electric-layout-local-mode 1)
-;; (electric-pair-local-mode 1)
-;; (electric-indent-local-mode 1)
-;; (setq-local electric-layout-rules
-;; '((?\{ . (before after-stay after))))
-;; (insert "int main () ")
-;; (let ((last-command-event ?\{))
-;; (call-interactively (key-binding `[,last-command-event])))
-;; (should (equal (buffer-string) "int main ()\n{\n \n}"))))
+(ert-deftest electric-layout-int-main-kernel-style ()
+ (ert-with-test-buffer ()
+ (c-mode)
+ (electric-layout-local-mode 1)
+ (electric-pair-local-mode 1)
+ (electric-indent-local-mode 1)
+ (setq-local electric-layout-rules
+ '((?\{ . (after-stay after))))
+ (insert "int main () ")
+ (let ((last-command-event ?\{))
+ (call-interactively (key-binding `[,last-command-event])))
+ (should (equal (buffer-string) "int main () {\n \n}"))))
+
+(ert-deftest electric-layout-int-main-allman-style ()
+ (ert-with-test-buffer ()
+ (c-mode)
+ (electric-layout-local-mode 1)
+ (electric-pair-local-mode 1)
+ (electric-indent-local-mode 1)
+ (setq-local electric-layout-rules
+ '((?\{ . (before after-stay after))))
+ (insert "int main () ")
+ (let ((last-command-event ?\{))
+ (call-interactively (key-binding `[,last-command-event])))
+ (should (equal (buffer-string) "int main ()\n{\n \n}"))))
(define-derived-mode plainer-c-mode c-mode "pC"
"A plainer/saner C-mode with no internal electric machinery."