procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Temporarily comment out CC Mode from tests..."

Browse source 
This reverts commit 54f297904e.
This commit is contained in:
João Távora 2019-01-17 18:08:01 +00:00
parent e5663bea40
commit 4bdc037469
1 changed files with 29 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
test/lisp/electric-tests.el
View file

@ -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-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-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."