[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master a95c2ce 42/66: Reorganize tests layout
|
From: |
Dmitry Gutov |
|
Subject: |
[elpa] master a95c2ce 42/66: Reorganize tests layout |
|
Date: |
Tue, 13 Jan 2015 02:44:59 +0000 |
branch: master
commit a95c2ceb924301749f440d33daf5de27eb47a195
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
Reorganize tests layout
---
Makefile | 4 +-
company-tests.el | 939 +------------------------
test/all.el | 28 +
test/async-tests.el | 161 +++++
test/clang-tests.el | 11 +
test/core-tests.el | 420 +++++++++++
company-elisp-tests.el => test/elisp-tests.el | 9 +-
test/frontends-tests.el | 289 ++++++++
test/keywords-tests.el | 32 +
test/template-tests.el | 91 +++
test/transformers-tests.el | 58 ++
11 files changed, 1098 insertions(+), 944 deletions(-)
diff --git a/Makefile b/Makefile
index c52be4b..fada444 100644
--- a/Makefile
+++ b/Makefile
@@ -20,11 +20,11 @@ clean:
@rm -rf company-*/ company-*.tar company-*.tar.bz2 *.elc ert.el
test:
- ${EMACS} -Q -nw -L . -l company-tests.el -l company-elisp-tests.el \
+ ${EMACS} -Q -nw -L . -l test/all.el \
--eval "(let (pop-up-windows) (ert t))"
test-batch:
- ${EMACS} -Q --batch -L . -l company-tests.el -l company-elisp-tests.el \
+ ${EMACS} -Q --batch -L . -l test/all.el \
--eval "(ert-run-tests-batch-and-exit '(not (tag interactive)))"
compile:
diff --git a/company-tests.el b/company-tests.el
index 273ddda..f0d669d 100644
--- a/company-tests.el
+++ b/company-tests.el
@@ -1,8 +1,8 @@
-;;; company-tests.el --- company-mode tests -*- lexical-binding: t -*-
+;;; company-tests.el --- company-mode test helpers -*- lexical-binding: t -*-
;; Copyright (C) 2011, 2013-2014 Free Software Foundation, Inc.
-;; Author: Nikolaj Schumacher
+;; Author: Dmitry Gutov
;; This file is part of GNU Emacs.
@@ -19,904 +19,11 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-;;
-
-;;; Code:
-
-(require 'ert)
(require 'company)
-(require 'company-keywords)
-(require 'company-clang)
(defun company--column (&optional pos)
(car (company--col-row pos)))
-;;; Core
-
-(ert-deftest company-sorted-keywords ()
- "Test that keywords in `company-keywords-alist' are in alphabetical order."
- (dolist (pair company-keywords-alist)
- (when (consp (cdr pair))
- (let ((prev (cadr pair)))
- (dolist (next (cddr pair))
- (should (not (equal prev next)))
- (should (string< prev next))
- (setq prev next))))))
-
-(ert-deftest company-good-prefix ()
- (let ((company-minimum-prefix-length 5)
- company-abort-manual-when-too-short
- company--manual-action ;idle begin
- (company-selection-changed t)) ;has no effect
- (should (eq t (company--good-prefix-p "address@hidden")))
- (should (eq nil (company--good-prefix-p "abcd")))
- (should (eq nil (company--good-prefix-p 'stop)))
- (should (eq t (company--good-prefix-p '("foo" . 5))))
- (should (eq nil (company--good-prefix-p '("foo" . 4))))
- (should (eq t (company--good-prefix-p '("foo" . t))))))
-
-(ert-deftest company--manual-prefix-set-and-unset ()
- (with-temp-buffer
- (insert "ab")
- (company-mode)
- (let (company-frontends
- (company-backends
- (list (lambda (command &optional _)
- (cl-case command
- (prefix (buffer-substring (point-min) (point)))
- (candidates '("abc" "abd")))))))
- (company-manual-begin)
- (should (equal "ab" company--manual-prefix))
- (company-abort)
- (should (null company--manual-prefix)))))
-
-(ert-deftest company-abort-manual-when-too-short ()
- (let ((company-minimum-prefix-length 5)
- (company-abort-manual-when-too-short t)
- (company-selection-changed t)) ;has not effect
- (let ((company--manual-action nil)) ;idle begin
- (should (eq t (company--good-prefix-p "address@hidden")))
- (should (eq t (company--good-prefix-p '("foo" . 5))))
- (should (eq t (company--good-prefix-p '("foo" . t)))))
- (let ((company--manual-action t)
- (company--manual-prefix "abc")) ;manual begin from this prefix
- (should (eq t (company--good-prefix-p "address@hidden")))
- (should (eq nil (company--good-prefix-p "ab")))
- (should (eq nil (company--good-prefix-p 'stop)))
- (should (eq t (company--good-prefix-p '("foo" . 4))))
- (should (eq t (company--good-prefix-p "abcd")))
- (should (eq t (company--good-prefix-p "abc")))
- (should (eq t (company--good-prefix-p '("bar" . t)))))))
-
-(ert-deftest company-common-with-non-prefix-completion ()
- (let ((company-backend #'ignore)
- (company-prefix "abc")
- company-candidates
- company-candidates-length
- company-candidates-cache
- company-common)
- (company-update-candidates '("abc" "def-abc"))
- (should (null company-common))
- (company-update-candidates '("abc" "abe-c"))
- (should (null company-common))
- (company-update-candidates '("abcd" "abcde" "abcdf"))
- (should (equal "abcd" company-common))))
-
-(ert-deftest company-multi-backend-with-lambdas ()
- (let ((company-backend
- (list (lambda (command &optional _ &rest _r)
- (cl-case command
- (prefix "z")
- (candidates '("a" "b"))))
- (lambda (command &optional _ &rest _r)
- (cl-case command
- (prefix "z")
- (candidates '("c" "d")))))))
- (should (equal (company-call-backend 'candidates "z") '("a" "b" "c"
"d")))))
-
-(ert-deftest company-multi-backend-filters-backends-by-prefix ()
- (let ((company-backend
- (list (lambda (command &optional _ &rest _r)
- (cl-case command
- (prefix (cons "z" t))
- (candidates '("a" "b"))))
- (lambda (command &optional _ &rest _r)
- (cl-case command
- (prefix "t")
- (candidates '("c" "d"))))
- (lambda (command &optional _ &rest _r)
- (cl-case command
- (prefix "z")
- (candidates '("e" "f")))))))
- (should (equal (company-call-backend 'candidates "z") '("a" "b" "e"
"f")))))
-
-(ert-deftest company-multi-backend-remembers-candidate-backend ()
- (let ((company-backend
- (list (lambda (command &optional _)
- (cl-case command
- (ignore-case nil)
- (annotation "1")
- (candidates '("a" "c"))
- (post-completion "13")))
- (lambda (command &optional _)
- (cl-case command
- (ignore-case t)
- (annotation "2")
- (candidates '("b" "d"))
- (post-completion "42")))
- (lambda (command &optional _)
- (cl-case command
- (annotation "3")
- (candidates '("e"))
- (post-completion "74"))))))
- (let ((candidates (company-calculate-candidates nil)))
- (should (equal candidates '("a" "b" "c" "d" "e")))
- (should (equal t (company-call-backend 'ignore-case)))
- (should (equal "1" (company-call-backend 'annotation (nth 0
candidates))))
- (should (equal "2" (company-call-backend 'annotation (nth 1
candidates))))
- (should (equal "13" (company-call-backend 'post-completion (nth 2
candidates))))
- (should (equal "42" (company-call-backend 'post-completion (nth 3
candidates))))
- (should (equal "3" (company-call-backend 'annotation (nth 4
candidates))))
- (should (equal "74" (company-call-backend 'post-completion (nth 4
candidates)))))))
-
-(ert-deftest company-multi-backend-handles-keyword-with ()
- (let ((primo (lambda (command &optional _)
- (cl-case command
- (prefix "a")
- (candidates '("abb" "abc" "abd")))))
- (secundo (lambda (command &optional _)
- (cl-case command
- (prefix "a")
- (candidates '("acc" "acd"))))))
- (let ((company-backend (list 'ignore 'ignore :with secundo)))
- (should (null (company-call-backend 'prefix))))
- (let ((company-backend (list 'ignore primo :with secundo)))
- (should (equal "a" (company-call-backend 'prefix)))
- (should (equal '("abb" "abc" "abd" "acc" "acd")
- (company-call-backend 'candidates "a"))))))
-
-(ert-deftest company-begin-backend-failure-doesnt-break-company-backends ()
- (with-temp-buffer
- (insert "a")
- (company-mode)
- (should-error
- (company-begin-backend #'ignore))
- (let (company-frontends
- (company-backends
- (list (lambda (command &optional _)
- (cl-case command
- (prefix "a")
- (candidates '("a" "ab" "ac")))))))
- (let (this-command)
- (company-call 'complete))
- (should (eq 3 company-candidates-length)))))
-
-(ert-deftest company-require-match-explicit ()
- (with-temp-buffer
- (insert "ab")
- (company-mode)
- (let (company-frontends
- (company-require-match 'company-explicit-action-p)
- (company-backends
- (list (lambda (command &optional _)
- (cl-case command
- (prefix (buffer-substring (point-min) (point)))
- (candidates '("abc" "abd")))))))
- (let (this-command)
- (company-complete))
- (let ((last-command-event ?e))
- (company-call 'self-insert-command 1))
- (should (eq 2 company-candidates-length))
- (should (eq 3 (point))))))
-
-(ert-deftest company-dont-require-match-when-idle ()
- (with-temp-buffer
- (insert "ab")
- (company-mode)
- (let (company-frontends
- (company-minimum-prefix-length 2)
- (company-require-match 'company-explicit-action-p)
- (company-backends
- (list (lambda (command &optional _)
- (cl-case command
- (prefix (buffer-substring (point-min) (point)))
- (candidates '("abc" "abd")))))))
- (company-idle-begin (current-buffer) (selected-window)
- (buffer-chars-modified-tick) (point))
- (should (eq 2 company-candidates-length))
- (let ((last-command-event ?e))
- (company-call 'self-insert-command 1))
- (should (eq nil company-candidates-length))
- (should (eq 4 (point))))))
-
-(ert-deftest company-dont-require-match-if-old-prefix-ended-and-was-a-match ()
- (with-temp-buffer
- (insert "ab")
- (company-mode)
- (let (company-frontends
- (company-require-match 'company-explicit-action-p)
- (company-backends
- (list (lambda (command &optional _)
- (cl-case command
- (prefix (company-grab-word))
- (candidates '("abc" "ab" "abd"))
- (sorted t))))))
- (let (this-command)
- (company-complete))
- (let ((last-command-event ?e))
- (company-call 'self-insert-command 1))
- (should (eq 3 company-candidates-length))
- (should (eq 3 (point)))
- (let ((last-command-event ? ))
- (company-call 'self-insert-command 1))
- (should (null company-candidates-length))
- (should (eq 4 (point))))))
-
-(ert-deftest company-should-complete-whitelist ()
- (with-temp-buffer
- (insert "ab")
- (company-mode)
- (let (company-frontends
- company-begin-commands
- (company-backends
- (list (lambda (command &optional _)
- (cl-case command
- (prefix (buffer-substring (point-min) (point)))
- (candidates '("abc" "abd")))))))
- (let ((company-continue-commands nil))
- (let (this-command)
- (company-complete))
- (company-call 'backward-delete-char 1)
- (should (null company-candidates-length)))
- (let ((company-continue-commands '(backward-delete-char)))
- (let (this-command)
- (company-complete))
- (company-call 'backward-delete-char 1)
- (should (eq 2 company-candidates-length))))))
-
-(ert-deftest company-should-complete-blacklist ()
- (with-temp-buffer
- (insert "ab")
- (company-mode)
- (let (company-frontends
- company-begin-commands
- (company-backends
- (list (lambda (command &optional _)
- (cl-case command
- (prefix (buffer-substring (point-min) (point)))
- (candidates '("abc" "abd")))))))
- (let ((company-continue-commands '(not backward-delete-char)))
- (let (this-command)
- (company-complete))
- (company-call 'backward-delete-char 1)
- (should (null company-candidates-length)))
- (let ((company-continue-commands '(not backward-delete-char-untabify)))
- (let (this-command)
- (company-complete))
- (company-call 'backward-delete-char 1)
- (should (eq 2 company-candidates-length))))))
-
-(ert-deftest company-auto-complete-explicit ()
- (with-temp-buffer
- (insert "ab")
- (company-mode)
- (let (company-frontends
- (company-auto-complete 'company-explicit-action-p)
- (company-auto-complete-chars '(? ))
- (company-backends
- (list (lambda (command &optional _)
- (cl-case command
- (prefix (buffer-substring (point-min) (point)))
- (candidates '("abcd" "abef")))))))
- (let (this-command)
- (company-complete))
- (let ((last-command-event ? ))
- (company-call 'self-insert-command 1))
- (should (string= "abcd " (buffer-string))))))
-
-(ert-deftest company-no-auto-complete-when-idle ()
- (with-temp-buffer
- (insert "ab")
- (company-mode)
- (let (company-frontends
- (company-auto-complete 'company-explicit-action-p)
- (company-auto-complete-chars '(? ))
- (company-minimum-prefix-length 2)
- (company-backends
- (list (lambda (command &optional _)
- (cl-case command
- (prefix (buffer-substring (point-min) (point)))
- (candidates '("abcd" "abef")))))))
- (company-idle-begin (current-buffer) (selected-window)
- (buffer-chars-modified-tick) (point))
- (let ((last-command-event ? ))
- (company-call 'self-insert-command 1))
- (should (string= "ab " (buffer-string))))))
-
-(ert-deftest company-clears-explicit-action-when-no-matches ()
- (with-temp-buffer
- (company-mode)
- (let (company-frontends
- company-backends)
- (company-call 'manual-begin) ;; fails
- (should (null company-candidates))
- (should (null (company-explicit-action-p))))))
-
-(ert-deftest company-ignore-case-replaces-prefix ()
- (with-temp-buffer
- (company-mode)
- (let (company-frontends
- (company-backends
- (list (lambda (command &optional _)
- (cl-case command
- (prefix (buffer-substring (point-min) (point)))
- (candidates '("abcd" "abef"))
- (ignore-case t))))))
- (insert "A")
- (let (this-command)
- (company-complete))
- (should (string= "ab" (buffer-string)))
- (delete-char -2)
- (insert "A") ; hack, to keep it in one test
- (company-complete-selection)
- (should (string= "abcd" (buffer-string))))))
-
-(ert-deftest company-ignore-case-with-keep-prefix ()
- (with-temp-buffer
- (insert "AB")
- (company-mode)
- (let (company-frontends
- (company-backends
- (list (lambda (command &optional _)
- (cl-case command
- (prefix (buffer-substring (point-min) (point)))
- (candidates '("abcd" "abef"))
- (ignore-case 'keep-prefix))))))
- (let (this-command)
- (company-complete))
- (company-complete-selection)
- (should (string= "ABcd" (buffer-string))))))
-
-(ert-deftest company-non-prefix-completion ()
- (with-temp-buffer
- (insert "tc")
- (company-mode)
- (let (company-frontends
- (company-backends
- (list (lambda (command &optional _)
- (cl-case command
- (prefix (buffer-substring (point-min) (point)))
- (candidates '("tea-cup" "teal-color")))))))
- (let (this-command)
- (company-complete))
- (should (string= "tc" (buffer-string)))
- (company-complete-selection)
- (should (string= "tea-cup" (buffer-string))))))
-
-(ert-deftest company-pseudo-tooltip-does-not-get-displaced ()
- :tags '(interactive)
- (with-temp-buffer
- (save-window-excursion
- (set-window-buffer nil (current-buffer))
- (save-excursion (insert " ff"))
- (company-mode)
- (let ((company-frontends '(company-pseudo-tooltip-frontend))
- (company-begin-commands '(self-insert-command))
- (company-backends
- (list (lambda (c &optional _)
- (cl-case c (prefix "") (candidates '("a" "b" "c")))))))
- (let (this-command)
- (company-call 'complete))
- (company-call 'open-line 1)
- (should (eq 1 (overlay-start company-pseudo-tooltip-overlay)))))))
-
-(ert-deftest company-pseudo-tooltip-show ()
- :tags '(interactive)
- (with-temp-buffer
- (save-window-excursion
- (set-window-buffer nil (current-buffer))
- (insert "aaaa\n bb\nccccccc\nddd")
- (search-backward "bb")
- (let ((col (company--column))
- (company-candidates-length 2)
- (company-candidates '("123" "45"))
- (company-backend 'ignore))
- (company-pseudo-tooltip-show (company--row) col 0)
- (let ((ov company-pseudo-tooltip-overlay))
- ;; With margins.
- (should (eq (overlay-get ov 'company-width) 5))
- ;; FIXME: Make it 2?
- (should (eq (overlay-get ov 'company-height) company-tooltip-limit))
- (should (eq (overlay-get ov 'company-column) col))
- (should (string= (overlay-get ov 'company-display)
- "\n 123 \nc 45 c\nddd\n")))))))
-
-(ert-deftest company-pseudo-tooltip-edit-updates-width ()
- :tags '(interactive)
- (with-temp-buffer
- (set-window-buffer nil (current-buffer))
- (let ((company-candidates-length 5)
- (company-candidates '("123" "45" "67" "89" "1011"))
- (company-backend 'ignore)
- (company-tooltip-limit 4)
- (company-tooltip-offset-display 'scrollbar))
- (company-pseudo-tooltip-show (company--row)
- (company--column)
- 0)
- (should (eq (overlay-get company-pseudo-tooltip-overlay 'company-width)
- 6))
- (company-pseudo-tooltip-edit 4)
- (should (eq (overlay-get company-pseudo-tooltip-overlay 'company-width)
- 7)))))
-
-(ert-deftest company-preview-show-with-annotations ()
- :tags '(interactive)
- (with-temp-buffer
- (save-window-excursion
- (set-window-buffer nil (current-buffer))
- (save-excursion (insert "\n"))
- (let ((company-candidates-length 1)
- (company-candidates '("123")))
- (company-preview-show-at-point (point))
- (let* ((ov company-preview-overlay)
- (str (overlay-get ov 'after-string)))
- (should (string= str "123"))
- (should (eq (get-text-property 0 'cursor str) 1)))))))
-
-(ert-deftest company-pseudo-tooltip-show-with-annotations ()
- :tags '(interactive)
- (with-temp-buffer
- (save-window-excursion
- (set-window-buffer nil (current-buffer))
- (insert " ")
- (save-excursion (insert "\n"))
- (let ((company-candidates-length 2)
- (company-backend (lambda (action &optional arg &rest _ignore)
- (when (eq action 'annotation)
- (cdr (assoc arg '(("123" . "(4)")))))))
- (company-candidates '("123" "45"))
- company-tooltip-align-annotations)
- (company-pseudo-tooltip-show-at-point (point) 0)
- (let ((ov company-pseudo-tooltip-overlay))
- ;; With margins.
- (should (eq (overlay-get ov 'company-width) 8))
- (should (string= (overlay-get ov 'company-display)
- "\n 123(4) \n 45 \n")))))))
-
-(ert-deftest company-pseudo-tooltip-show-with-annotations-right-aligned ()
- :tags '(interactive)
- (with-temp-buffer
- (save-window-excursion
- (set-window-buffer nil (current-buffer))
- (insert " ")
- (save-excursion (insert "\n"))
- (let ((company-candidates-length 3)
- (company-backend (lambda (action &optional arg &rest _ignore)
- (when (eq action 'annotation)
- (cdr (assoc arg '(("123" . "(4)")
- ("67" . "(891011)")))))))
- (company-candidates '("123" "45" "67"))
- (company-tooltip-align-annotations t))
- (company-pseudo-tooltip-show-at-point (point) 0)
- (let ((ov company-pseudo-tooltip-overlay))
- ;; With margins.
- (should (eq (overlay-get ov 'company-width) 13))
- (should (string= (overlay-get ov 'company-display)
- "\n 123 (4) \n 45 \n 67 (891011)
\n")))))))
-
-(ert-deftest company-create-lines-shows-numbers ()
- (let ((company-show-numbers t)
- (company-candidates '("x" "y" "z"))
- (company-candidates-length 3)
- (company-backend 'ignore))
- (should (equal '(" x 1 " " y 2 " " z 3 ")
- (company--create-lines 0 999)))))
-
-(ert-deftest company-create-lines-truncates-annotations ()
- (let* ((ww (company--window-width))
- (data `(("1" . "(123)")
- ("2" . nil)
- ("3" . ,(concat "(" (make-string (- ww 2) ?4) ")"))
- (,(make-string ww ?4) . "<4>")))
- (company-candidates (mapcar #'car data))
- (company-candidates-length 4)
- (company-tooltip-margin 1)
- (company-backend (lambda (cmd &optional arg)
- (when (eq cmd 'annotation)
- (cdr (assoc arg data)))))
- company-tooltip-align-annotations)
- (should (equal (list (format " 1(123)%s " (company-space-string (- ww 8)))
- (format " 2%s " (company-space-string (- ww 3)))
- (format " 3(444%s " (make-string (- ww 7) ?4))
- (format " %s " (make-string (- ww 2) ?4)))
- (company--create-lines 0 999)))
- (let ((company-tooltip-align-annotations t))
- (should (equal (list (format " 1%s(123) " (company-space-string (- ww
8)))
- (format " 2%s " (company-space-string (- ww 3)))
- (format " 3 (444%s " (make-string (- ww 8) ?4))
- (format " %s " (make-string (- ww 2) ?4)))
- (company--create-lines 0 999))))))
-
-(ert-deftest company-create-lines-truncates-common-part ()
- (let* ((ww (company--window-width))
- (company-candidates-length 2)
- (company-tooltip-margin 1)
- (company-backend #'ignore))
- (let* ((company-common (make-string (- ww 3) ?1))
- (company-candidates `(,(concat company-common "2")
- ,(concat company-common "3"))))
- (should (equal (list (format " %s2 " (make-string (- ww 3) ?1))
- (format " %s3 " (make-string (- ww 3) ?1)))
- (company--create-lines 0 999))))
- (let* ((company-common (make-string (- ww 2) ?1))
- (company-candidates `(,(concat company-common "2")
- ,(concat company-common "3"))))
- (should (equal (list (format " %s " company-common)
- (format " %s " company-common))
- (company--create-lines 0 999))))
- (let* ((company-common (make-string ww ?1))
- (company-candidates `(,(concat company-common "2")
- ,(concat company-common "3")))
- (res (company--create-lines 0 999)))
- (should (equal (list (format " %s " (make-string (- ww 2) ?1))
- (format " %s " (make-string (- ww 2) ?1)))
- res))
- (should (eq 'company-tooltip-common-selection
- (get-text-property (- ww 2) 'face
- (car res))))
- (should (eq 'company-tooltip-selection
- (get-text-property (1- ww) 'face
- (car res))))
- )))
-
-(ert-deftest company-create-lines-clears-out-non-printables ()
- :tags '(interactive)
- (let (company-show-numbers
- (company-candidates (list
- (decode-coding-string "avalis\351e" 'utf-8)
- "avatar"))
- (company-candidates-length 2)
- (company-backend 'ignore))
- (should (equal '(" avalis‗e "
- " avatar ")
- (company--create-lines 0 999)))))
-
-(ert-deftest company-create-lines-handles-multiple-width ()
- :tags '(interactive)
- (let (company-show-numbers
- (company-candidates '("蛙蛙蛙蛙" "蛙abc"))
- (company-candidates-length 2)
- (company-backend 'ignore))
- (should (equal '(" 蛙蛙蛙蛙 "
- " 蛙abc ")
- (company--create-lines 0 999)))))
-
-(ert-deftest company-create-lines-handles-multiple-width-in-annotation ()
- (let* (company-show-numbers
- (alist '(("a" . " ︸") ("b" . " ︸︸")))
- (company-candidates (mapcar #'car alist))
- (company-candidates-length 2)
- (company-backend (lambda (c &optional a)
- (when (eq c 'annotation)
- (assoc-default a alist)))))
- (should (equal '(" a ︸ "
- " b ︸︸ ")
- (company--create-lines 0 999)))))
-
-(ert-deftest company-column-with-composition ()
- :tags '(interactive)
- (with-temp-buffer
- (save-window-excursion
- (set-window-buffer nil (current-buffer))
- (insert "lambda ()")
- (compose-region 1 (1+ (length "lambda")) "\\")
- (should (= (company--column) 4)))))
-
-(ert-deftest company-column-with-line-prefix ()
- :tags '(interactive)
- (with-temp-buffer
- (save-window-excursion
- (set-window-buffer nil (current-buffer))
- (insert "foo")
- (put-text-property (point-min) (point) 'line-prefix " ")
- (should (= (company--column) 5)))))
-
-(ert-deftest company-column-with-line-prefix-on-empty-line ()
- :tags '(interactive)
- (with-temp-buffer
- (save-window-excursion
- (set-window-buffer nil (current-buffer))
- (insert "\n")
- (forward-char -1)
- (put-text-property (point-min) (point-max) 'line-prefix " ")
- (should (= (company--column) 2)))))
-
-(ert-deftest company-column-with-tabs ()
- :tags '(interactive)
- (with-temp-buffer
- (save-window-excursion
- (set-window-buffer nil (current-buffer))
- (insert "|\t|\t|\t(")
- (let ((tab-width 8))
- (should (= (company--column) 25))))))
-
-(ert-deftest company-row-with-header-line-format ()
- :tags '(interactive)
- (with-temp-buffer
- (save-window-excursion
- (set-window-buffer nil (current-buffer))
- (should (= (company--row) 0))
- (setq header-line-format "aaaaaaa")
- (should (= (company--row) 0)))))
-
-(ert-deftest company-plainify ()
- (let ((tab-width 8))
- (should (equal-including-properties
- (company-plainify "\tabc\td\t")
- (concat " "
- "abc "
- "d "))))
- (should (equal-including-properties
- (company-plainify (propertize "foobar" 'line-prefix "-*-"))
- "-*-foobar")))
-
-(ert-deftest company-buffer-lines-with-lines-folded ()
- :tags '(interactive)
- (with-temp-buffer
- (insert (propertize "aaa\nbbb\nccc\nddd\n" 'display "aaa+\n"))
- (insert "eee\nfff\nggg")
- (should (equal (company-buffer-lines (point-min) (point-max))
- '("aaa" "eee" "fff" "ggg")))))
-
-(ert-deftest company-buffer-lines-with-multiline-display ()
- :tags '(interactive)
- (with-temp-buffer
- (insert (propertize "a" 'display "bbb\nccc\ndddd\n"))
- (insert "eee\nfff\nggg")
- (should (equal (company-buffer-lines (point-min) (point-max))
- '("" "" "" "eee" "fff" "ggg")))))
-
-(ert-deftest company-modify-line ()
- (let ((str "-*-foobar"))
- (should (equal-including-properties
- (company-modify-line str "zz" 4)
- "-*-fzzbar"))
- (should (equal-including-properties
- (company-modify-line str "xx" 0)
- "xx-foobar"))
- (should (equal-including-properties
- (company-modify-line str "zz" 10)
- "-*-foobar zz"))))
-
-(ert-deftest company-scrollbar-bounds ()
- (should (equal nil (company--scrollbar-bounds 0 3 3)))
- (should (equal nil (company--scrollbar-bounds 0 4 3)))
- (should (equal '(0 . 0) (company--scrollbar-bounds 0 1 2)))
- (should (equal '(1 . 1) (company--scrollbar-bounds 2 2 4)))
- (should (equal '(2 . 3) (company--scrollbar-bounds 7 4 12)))
- (should (equal '(1 . 2) (company--scrollbar-bounds 3 4 12)))
- (should (equal '(1 . 3) (company--scrollbar-bounds 4 5 11))))
-
-;;; Async
-
-(defun company-async-backend (command &optional _)
- (pcase command
- (`prefix "foo")
- (`candidates
- (cons :async
- (lambda (cb)
- (run-with-timer 0.05 nil
- #'funcall cb '("abc" "abd")))))))
-
-(ert-deftest company-call-backend-forces-sync ()
- (let ((company-backend 'company-async-backend)
- (company-async-timeout 0.1))
- (should (equal '("abc" "abd") (company-call-backend 'candidates)))))
-
-(ert-deftest company-call-backend-errors-on-timeout ()
- (with-temp-buffer
- (let* ((company-backend (lambda (command &optional _arg)
- (pcase command
- (`candidates (cons :async 'ignore)))))
- (company-async-timeout 0.1)
- (err (should-error (company-call-backend 'candidates "foo"))))
- (should (string-match-p "async timeout" (cadr err))))))
-
-(ert-deftest company-call-backend-raw-passes-return-value-verbatim ()
- (let ((company-backend 'company-async-backend))
- (should (equal "foo" (company-call-backend-raw 'prefix)))
- (should (equal :async (car (company-call-backend-raw 'candidates "foo"))))
- (should (equal 'closure (cadr (company-call-backend-raw 'candidates
"foo"))))))
-
-(ert-deftest company-manual-begin-forces-async-candidates-to-sync ()
- (with-temp-buffer
- (company-mode)
- (let (company-frontends
- company-transformers
- (company-backends (list 'company-async-backend)))
- (company-manual-begin)
- (should (equal "foo" company-prefix))
- (should (equal '("abc" "abd") company-candidates)))))
-
-(ert-deftest company-idle-begin-allows-async-candidates ()
- (with-temp-buffer
- (company-mode)
- (let (company-frontends
- company-transformers
- (company-backends (list 'company-async-backend)))
- (company-idle-begin (current-buffer) (selected-window)
- (buffer-chars-modified-tick) (point))
- (should (null company-candidates))
- (sleep-for 0.1)
- (should (equal "foo" company-prefix))
- (should (equal '("abc" "abd") company-candidates)))))
-
-(ert-deftest company-idle-begin-cancels-async-candidates-if-buffer-changed ()
- (with-temp-buffer
- (company-mode)
- (let (company-frontends
- (company-backends (list 'company-async-backend)))
- (company-idle-begin (current-buffer) (selected-window)
- (buffer-chars-modified-tick) (point))
- (should (null company-candidates))
- (insert "a")
- (sleep-for 0.1)
- (should (null company-candidates)))))
-
-(ert-deftest company-idle-begin-async-allows-immediate-callbacks ()
- (with-temp-buffer
- (company-mode)
- (let (company-frontends
- (company-backends
- (list (lambda (command &optional arg)
- (pcase command
- (`prefix (buffer-substring (point-min) (point)))
- (`candidates
- (let ((c (all-completions arg '("abc" "def"))))
- (cons :async
- (lambda (cb) (funcall cb c)))))
- (`no-cache t)))))
- (company-minimum-prefix-length 0))
- (company-idle-begin (current-buffer) (selected-window)
- (buffer-chars-modified-tick) (point))
- (should (equal '("abc" "def") company-candidates))
- (let ((last-command-event ?a))
- (company-call 'self-insert-command 1))
- (should (equal '("abc") company-candidates)))))
-
-(ert-deftest company-multi-backend-forces-prefix-to-sync ()
- (with-temp-buffer
- (let ((company-backend (list 'ignore
- (lambda (command)
- (should (eq command 'prefix))
- (cons :async
- (lambda (cb)
- (run-with-timer
- 0.01 nil
- (lambda () (funcall cb nil))))))
- (lambda (command)
- (should (eq command 'prefix))
- "foo"))))
- (should (equal "foo" (company-call-backend-raw 'prefix))))
- (let ((company-backend (list (lambda (_command)
- (cons :async
- (lambda (cb)
- (run-with-timer
- 0.01 nil
- (lambda () (funcall cb "bar"))))))
- (lambda (_command)
- "foo"))))
- (should (equal "bar" (company-call-backend-raw 'prefix))))))
-
-(ert-deftest company-multi-backend-merges-deferred-candidates ()
- (with-temp-buffer
- (let* ((immediate (lambda (command &optional _)
- (pcase command
- (`prefix "foo")
- (`candidates
- (cons :async
- (lambda (cb) (funcall cb '("f"))))))))
- (company-backend (list 'ignore
- (lambda (command &optional arg)
- (pcase command
- (`prefix "foo")
- (`candidates
- (should (equal arg "foo"))
- (cons :async
- (lambda (cb)
- (run-with-timer
- 0.01 nil
- (lambda () (funcall cb '("a"
"b")))))))))
- (lambda (command &optional _)
- (pcase command
- (`prefix "foo")
- (`candidates '("c" "d" "e"))))
- immediate)))
- (should (equal :async (car (company-call-backend-raw 'candidates
"foo"))))
- (should (equal '("a" "b" "c" "d" "e" "f")
- (company-call-backend 'candidates "foo")))
- (let ((company-backend (list immediate)))
- (should (equal '("f") (company-call-backend 'candidates "foo")))))))
-
-;;; Transformers
-
-(ert-deftest company-occurrence-prefer-closest-above ()
- (with-temp-buffer
- (save-window-excursion
- (set-window-buffer nil (current-buffer))
- (insert "foo0
-foo1
-")
- (save-excursion
- (insert "
-foo3
-foo2"))
- (let ((company-backend 'company-dabbrev)
- (company-occurrence-weight-function
- 'company-occurrence-prefer-closest-above))
- (should (equal '("foo1" "foo0" "foo3" "foo2" "foo4")
- (company-sort-by-occurrence
- '("foo0" "foo1" "foo2" "foo3" "foo4"))))))))
-
-(ert-deftest company-occurrence-prefer-any-closest ()
- (with-temp-buffer
- (save-window-excursion
- (set-window-buffer nil (current-buffer))
- (insert "foo0
-foo1
-")
- (save-excursion
- (insert "
-foo3
-foo2"))
- (let ((company-backend 'company-dabbrev)
- (company-occurrence-weight-function
- 'company-occurrence-prefer-any-closest))
- (should (equal '("foo1" "foo3" "foo0" "foo2" "foo4")
- (company-sort-by-occurrence
- '("foo0" "foo1" "foo2" "foo3" "foo4"))))))))
-
-;;; Template
-
-(ert-deftest company-template-removed-after-the-last-jump ()
- (with-temp-buffer
- (insert "{ }")
- (goto-char 2)
- (let ((tpl (company-template-declare-template (point) (1- (point-max)))))
- (save-excursion
- (dotimes (_ 2)
- (insert " ")
- (company-template-add-field tpl (point) "foo")))
- (company-call 'template-forward-field)
- (should (= 3 (point)))
- (company-call 'template-forward-field)
- (should (= 7 (point)))
- (company-call 'template-forward-field)
- (should (= 11 (point)))
- (should (zerop (length (overlay-get tpl 'company-template-fields))))
- (should (null (overlay-buffer tpl))))))
-
-(ert-deftest company-template-removed-after-input-and-jump ()
- (with-temp-buffer
- (insert "{ }")
- (goto-char 2)
- (let ((tpl (company-template-declare-template (point) (1- (point-max)))))
- (save-excursion
- (insert " ")
- (company-template-add-field tpl (point) "bar"))
- (company-call 'template-move-to-first tpl)
- (should (= 3 (point)))
- (dolist (c (string-to-list "tee"))
- (let ((last-command-event c))
- (company-call 'self-insert-command 1)))
- (should (string= "{ tee }" (buffer-string)))
- (should (overlay-buffer tpl))
- (company-call 'template-forward-field)
- (should (= 7 (point)))
- (should (null (overlay-buffer tpl))))))
-
(defun company-call (name &rest args)
(let* ((maybe (intern (format "company-%s" name)))
(command (if (fboundp maybe) maybe name)))
@@ -926,44 +33,4 @@ foo2"))
(let ((this-command command))
(run-hooks 'post-command-hook))))
-(ert-deftest company-template-c-like-templatify ()
- (with-temp-buffer
- (let ((text "foo(int a, short b)"))
- (insert text)
- (company-template-c-like-templatify text)
- (should (equal "foo(arg0, arg1)" (buffer-string)))
- (should (looking-at "arg0"))
- (should (equal "int a"
- (overlay-get (company-template-field-at) 'display))))))
-
-(ert-deftest company-template-c-like-templatify-trims-after-closing-paren ()
- (with-temp-buffer
- (let ((text "foo(int a, short b)!@ #1334 a"))
- (insert text)
- (company-template-c-like-templatify text)
- (should (equal "foo(arg0, arg1)" (buffer-string)))
- (should (looking-at "arg0")))))
-
-(ert-deftest company-template-c-like-templatify-generics ()
- (with-temp-buffer
- (let ((text "foo<TKey, TValue>(int i, Dict<TKey, TValue>, long l)"))
- (insert text)
- (company-template-c-like-templatify text)
- (should (equal "foo<arg0, arg1>(arg2, arg3, arg4)" (buffer-string)))
- (should (looking-at "arg0"))
- (should (equal "TKey" (overlay-get (company-template-field-at)
'display)))
- (search-forward "arg3")
- (forward-char -1)
- (should (equal "Dict<TKey, TValue>"
- (overlay-get (company-template-field-at) 'display))))))
-
-;;; Clang
-
-(ert-deftest company-clang-objc-templatify ()
- (with-temp-buffer
- (let ((text "createBookWithTitle:andAuthor:"))
- (insert text)
- (company-clang-objc-templatify text)
- (should (equal "createBookWithTitle:arg0 andAuthor:arg1"
(buffer-string)))
- (should (looking-at "arg0"))
- (should (null (overlay-get (company-template-field-at) 'display))))))
+(provide 'company-tests)
diff --git a/test/all.el b/test/all.el
new file mode 100644
index 0000000..6d64a62
--- /dev/null
+++ b/test/all.el
@@ -0,0 +1,28 @@
+;;; all-tests.el --- company-mode tests -*- lexical-binding: t -*-
+
+;; Copyright (C) 2015 Free Software Foundation, Inc.
+
+;; Author: Dmitry Gutov
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs 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.
+
+;; GNU Emacs 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 GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
+
+(defvar company-test-path
+ (file-name-directory (or load-file-name buffer-file-name)))
+
+(require 'ert)
+
+(dolist (test-file (directory-files company-test-path t "-tests.el$"))
+ (load test-file nil t))
diff --git a/test/async-tests.el b/test/async-tests.el
new file mode 100644
index 0000000..5d8be3e
--- /dev/null
+++ b/test/async-tests.el
@@ -0,0 +1,161 @@
+;;; async-tests.el --- company-mode tests -*- lexical-binding: t -*-
+
+;; Copyright (C) 2015 Free Software Foundation, Inc.
+
+;; Author: Dmitry Gutov
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs 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.
+
+;; GNU Emacs 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 GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
+
+(require 'company-tests)
+
+(defun company-async-backend (command &optional _)
+ (pcase command
+ (`prefix "foo")
+ (`candidates
+ (cons :async
+ (lambda (cb)
+ (run-with-timer 0.05 nil
+ #'funcall cb '("abc" "abd")))))))
+
+(ert-deftest company-call-backend-forces-sync ()
+ (let ((company-backend 'company-async-backend)
+ (company-async-timeout 0.1))
+ (should (equal '("abc" "abd") (company-call-backend 'candidates)))))
+
+(ert-deftest company-call-backend-errors-on-timeout ()
+ (with-temp-buffer
+ (let* ((company-backend (lambda (command &optional _arg)
+ (pcase command
+ (`candidates (cons :async 'ignore)))))
+ (company-async-timeout 0.1)
+ (err (should-error (company-call-backend 'candidates "foo"))))
+ (should (string-match-p "async timeout" (cadr err))))))
+
+(ert-deftest company-call-backend-raw-passes-return-value-verbatim ()
+ (let ((company-backend 'company-async-backend))
+ (should (equal "foo" (company-call-backend-raw 'prefix)))
+ (should (equal :async (car (company-call-backend-raw 'candidates "foo"))))
+ (should (equal 'closure (cadr (company-call-backend-raw 'candidates
"foo"))))))
+
+(ert-deftest company-manual-begin-forces-async-candidates-to-sync ()
+ (with-temp-buffer
+ (company-mode)
+ (let (company-frontends
+ company-transformers
+ (company-backends (list 'company-async-backend)))
+ (company-manual-begin)
+ (should (equal "foo" company-prefix))
+ (should (equal '("abc" "abd") company-candidates)))))
+
+(ert-deftest company-idle-begin-allows-async-candidates ()
+ (with-temp-buffer
+ (company-mode)
+ (let (company-frontends
+ company-transformers
+ (company-backends (list 'company-async-backend)))
+ (company-idle-begin (current-buffer) (selected-window)
+ (buffer-chars-modified-tick) (point))
+ (should (null company-candidates))
+ (sleep-for 0.1)
+ (should (equal "foo" company-prefix))
+ (should (equal '("abc" "abd") company-candidates)))))
+
+(ert-deftest company-idle-begin-cancels-async-candidates-if-buffer-changed ()
+ (with-temp-buffer
+ (company-mode)
+ (let (company-frontends
+ (company-backends (list 'company-async-backend)))
+ (company-idle-begin (current-buffer) (selected-window)
+ (buffer-chars-modified-tick) (point))
+ (should (null company-candidates))
+ (insert "a")
+ (sleep-for 0.1)
+ (should (null company-candidates)))))
+
+(ert-deftest company-idle-begin-async-allows-immediate-callbacks ()
+ (with-temp-buffer
+ (company-mode)
+ (let (company-frontends
+ (company-backends
+ (list (lambda (command &optional arg)
+ (pcase command
+ (`prefix (buffer-substring (point-min) (point)))
+ (`candidates
+ (let ((c (all-completions arg '("abc" "def"))))
+ (cons :async
+ (lambda (cb) (funcall cb c)))))
+ (`no-cache t)))))
+ (company-minimum-prefix-length 0))
+ (company-idle-begin (current-buffer) (selected-window)
+ (buffer-chars-modified-tick) (point))
+ (should (equal '("abc" "def") company-candidates))
+ (let ((last-command-event ?a))
+ (company-call 'self-insert-command 1))
+ (should (equal '("abc") company-candidates)))))
+
+(ert-deftest company-multi-backend-forces-prefix-to-sync ()
+ (with-temp-buffer
+ (let ((company-backend (list 'ignore
+ (lambda (command)
+ (should (eq command 'prefix))
+ (cons :async
+ (lambda (cb)
+ (run-with-timer
+ 0.01 nil
+ (lambda () (funcall cb nil))))))
+ (lambda (command)
+ (should (eq command 'prefix))
+ "foo"))))
+ (should (equal "foo" (company-call-backend-raw 'prefix))))
+ (let ((company-backend (list (lambda (_command)
+ (cons :async
+ (lambda (cb)
+ (run-with-timer
+ 0.01 nil
+ (lambda () (funcall cb "bar"))))))
+ (lambda (_command)
+ "foo"))))
+ (should (equal "bar" (company-call-backend-raw 'prefix))))))
+
+(ert-deftest company-multi-backend-merges-deferred-candidates ()
+ (with-temp-buffer
+ (let* ((immediate (lambda (command &optional _)
+ (pcase command
+ (`prefix "foo")
+ (`candidates
+ (cons :async
+ (lambda (cb) (funcall cb '("f"))))))))
+ (company-backend (list 'ignore
+ (lambda (command &optional arg)
+ (pcase command
+ (`prefix "foo")
+ (`candidates
+ (should (equal arg "foo"))
+ (cons :async
+ (lambda (cb)
+ (run-with-timer
+ 0.01 nil
+ (lambda () (funcall cb '("a"
"b")))))))))
+ (lambda (command &optional _)
+ (pcase command
+ (`prefix "foo")
+ (`candidates '("c" "d" "e"))))
+ immediate)))
+ (should (equal :async (car (company-call-backend-raw 'candidates
"foo"))))
+ (should (equal '("a" "b" "c" "d" "e" "f")
+ (company-call-backend 'candidates "foo")))
+ (let ((company-backend (list immediate)))
+ (should (equal '("f") (company-call-backend 'candidates "foo")))))))
diff --git a/test/clang-tests.el b/test/clang-tests.el
new file mode 100644
index 0000000..4d23a29
--- /dev/null
+++ b/test/clang-tests.el
@@ -0,0 +1,11 @@
+(require 'company-tests)
+(require 'company-clang)
+
+(ert-deftest company-clang-objc-templatify ()
+ (with-temp-buffer
+ (let ((text "createBookWithTitle:andAuthor:"))
+ (insert text)
+ (company-clang-objc-templatify text)
+ (should (equal "createBookWithTitle:arg0 andAuthor:arg1"
(buffer-string)))
+ (should (looking-at "arg0"))
+ (should (null (overlay-get (company-template-field-at) 'display))))))
diff --git a/test/core-tests.el b/test/core-tests.el
new file mode 100644
index 0000000..0ff691e
--- /dev/null
+++ b/test/core-tests.el
@@ -0,0 +1,420 @@
+;;; core-tests.el --- company-mode tests -*- lexical-binding: t -*-
+
+;; Copyright (C) 2015 Free Software Foundation, Inc.
+
+;; Author: Dmitry Gutov
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs 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.
+
+;; GNU Emacs 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 GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
+
+(require 'company-tests)
+
+(ert-deftest company-good-prefix ()
+ (let ((company-minimum-prefix-length 5)
+ company-abort-manual-when-too-short
+ company--manual-action ;idle begin
+ (company-selection-changed t)) ;has no effect
+ (should (eq t (company--good-prefix-p "address@hidden")))
+ (should (eq nil (company--good-prefix-p "abcd")))
+ (should (eq nil (company--good-prefix-p 'stop)))
+ (should (eq t (company--good-prefix-p '("foo" . 5))))
+ (should (eq nil (company--good-prefix-p '("foo" . 4))))
+ (should (eq t (company--good-prefix-p '("foo" . t))))))
+
+(ert-deftest company--manual-prefix-set-and-unset ()
+ (with-temp-buffer
+ (insert "ab")
+ (company-mode)
+ (let (company-frontends
+ (company-backends
+ (list (lambda (command &optional _)
+ (cl-case command
+ (prefix (buffer-substring (point-min) (point)))
+ (candidates '("abc" "abd")))))))
+ (company-manual-begin)
+ (should (equal "ab" company--manual-prefix))
+ (company-abort)
+ (should (null company--manual-prefix)))))
+
+(ert-deftest company-abort-manual-when-too-short ()
+ (let ((company-minimum-prefix-length 5)
+ (company-abort-manual-when-too-short t)
+ (company-selection-changed t)) ;has not effect
+ (let ((company--manual-action nil)) ;idle begin
+ (should (eq t (company--good-prefix-p "address@hidden")))
+ (should (eq t (company--good-prefix-p '("foo" . 5))))
+ (should (eq t (company--good-prefix-p '("foo" . t)))))
+ (let ((company--manual-action t)
+ (company--manual-prefix "abc")) ;manual begin from this prefix
+ (should (eq t (company--good-prefix-p "address@hidden")))
+ (should (eq nil (company--good-prefix-p "ab")))
+ (should (eq nil (company--good-prefix-p 'stop)))
+ (should (eq t (company--good-prefix-p '("foo" . 4))))
+ (should (eq t (company--good-prefix-p "abcd")))
+ (should (eq t (company--good-prefix-p "abc")))
+ (should (eq t (company--good-prefix-p '("bar" . t)))))))
+
+(ert-deftest company-common-with-non-prefix-completion ()
+ (let ((company-backend #'ignore)
+ (company-prefix "abc")
+ company-candidates
+ company-candidates-length
+ company-candidates-cache
+ company-common)
+ (company-update-candidates '("abc" "def-abc"))
+ (should (null company-common))
+ (company-update-candidates '("abc" "abe-c"))
+ (should (null company-common))
+ (company-update-candidates '("abcd" "abcde" "abcdf"))
+ (should (equal "abcd" company-common))))
+
+(ert-deftest company-multi-backend-with-lambdas ()
+ (let ((company-backend
+ (list (lambda (command &optional _ &rest _r)
+ (cl-case command
+ (prefix "z")
+ (candidates '("a" "b"))))
+ (lambda (command &optional _ &rest _r)
+ (cl-case command
+ (prefix "z")
+ (candidates '("c" "d")))))))
+ (should (equal (company-call-backend 'candidates "z") '("a" "b" "c"
"d")))))
+
+(ert-deftest company-multi-backend-filters-backends-by-prefix ()
+ (let ((company-backend
+ (list (lambda (command &optional _ &rest _r)
+ (cl-case command
+ (prefix (cons "z" t))
+ (candidates '("a" "b"))))
+ (lambda (command &optional _ &rest _r)
+ (cl-case command
+ (prefix "t")
+ (candidates '("c" "d"))))
+ (lambda (command &optional _ &rest _r)
+ (cl-case command
+ (prefix "z")
+ (candidates '("e" "f")))))))
+ (should (equal (company-call-backend 'candidates "z") '("a" "b" "e"
"f")))))
+
+(ert-deftest company-multi-backend-remembers-candidate-backend ()
+ (let ((company-backend
+ (list (lambda (command &optional _)
+ (cl-case command
+ (ignore-case nil)
+ (annotation "1")
+ (candidates '("a" "c"))
+ (post-completion "13")))
+ (lambda (command &optional _)
+ (cl-case command
+ (ignore-case t)
+ (annotation "2")
+ (candidates '("b" "d"))
+ (post-completion "42")))
+ (lambda (command &optional _)
+ (cl-case command
+ (annotation "3")
+ (candidates '("e"))
+ (post-completion "74"))))))
+ (let ((candidates (company-calculate-candidates nil)))
+ (should (equal candidates '("a" "b" "c" "d" "e")))
+ (should (equal t (company-call-backend 'ignore-case)))
+ (should (equal "1" (company-call-backend 'annotation (nth 0
candidates))))
+ (should (equal "2" (company-call-backend 'annotation (nth 1
candidates))))
+ (should (equal "13" (company-call-backend 'post-completion (nth 2
candidates))))
+ (should (equal "42" (company-call-backend 'post-completion (nth 3
candidates))))
+ (should (equal "3" (company-call-backend 'annotation (nth 4
candidates))))
+ (should (equal "74" (company-call-backend 'post-completion (nth 4
candidates)))))))
+
+(ert-deftest company-multi-backend-handles-keyword-with ()
+ (let ((primo (lambda (command &optional _)
+ (cl-case command
+ (prefix "a")
+ (candidates '("abb" "abc" "abd")))))
+ (secundo (lambda (command &optional _)
+ (cl-case command
+ (prefix "a")
+ (candidates '("acc" "acd"))))))
+ (let ((company-backend (list 'ignore 'ignore :with secundo)))
+ (should (null (company-call-backend 'prefix))))
+ (let ((company-backend (list 'ignore primo :with secundo)))
+ (should (equal "a" (company-call-backend 'prefix)))
+ (should (equal '("abb" "abc" "abd" "acc" "acd")
+ (company-call-backend 'candidates "a"))))))
+
+(ert-deftest company-begin-backend-failure-doesnt-break-company-backends ()
+ (with-temp-buffer
+ (insert "a")
+ (company-mode)
+ (should-error
+ (company-begin-backend #'ignore))
+ (let (company-frontends
+ (company-backends
+ (list (lambda (command &optional _)
+ (cl-case command
+ (prefix "a")
+ (candidates '("a" "ab" "ac")))))))
+ (let (this-command)
+ (company-call 'complete))
+ (should (eq 3 company-candidates-length)))))
+
+(ert-deftest company-require-match-explicit ()
+ (with-temp-buffer
+ (insert "ab")
+ (company-mode)
+ (let (company-frontends
+ (company-require-match 'company-explicit-action-p)
+ (company-backends
+ (list (lambda (command &optional _)
+ (cl-case command
+ (prefix (buffer-substring (point-min) (point)))
+ (candidates '("abc" "abd")))))))
+ (let (this-command)
+ (company-complete))
+ (let ((last-command-event ?e))
+ (company-call 'self-insert-command 1))
+ (should (eq 2 company-candidates-length))
+ (should (eq 3 (point))))))
+
+(ert-deftest company-dont-require-match-when-idle ()
+ (with-temp-buffer
+ (insert "ab")
+ (company-mode)
+ (let (company-frontends
+ (company-minimum-prefix-length 2)
+ (company-require-match 'company-explicit-action-p)
+ (company-backends
+ (list (lambda (command &optional _)
+ (cl-case command
+ (prefix (buffer-substring (point-min) (point)))
+ (candidates '("abc" "abd")))))))
+ (company-idle-begin (current-buffer) (selected-window)
+ (buffer-chars-modified-tick) (point))
+ (should (eq 2 company-candidates-length))
+ (let ((last-command-event ?e))
+ (company-call 'self-insert-command 1))
+ (should (eq nil company-candidates-length))
+ (should (eq 4 (point))))))
+
+(ert-deftest company-dont-require-match-if-old-prefix-ended-and-was-a-match ()
+ (with-temp-buffer
+ (insert "ab")
+ (company-mode)
+ (let (company-frontends
+ (company-require-match 'company-explicit-action-p)
+ (company-backends
+ (list (lambda (command &optional _)
+ (cl-case command
+ (prefix (company-grab-word))
+ (candidates '("abc" "ab" "abd"))
+ (sorted t))))))
+ (let (this-command)
+ (company-complete))
+ (let ((last-command-event ?e))
+ (company-call 'self-insert-command 1))
+ (should (eq 3 company-candidates-length))
+ (should (eq 3 (point)))
+ (let ((last-command-event ? ))
+ (company-call 'self-insert-command 1))
+ (should (null company-candidates-length))
+ (should (eq 4 (point))))))
+
+(ert-deftest company-should-complete-whitelist ()
+ (with-temp-buffer
+ (insert "ab")
+ (company-mode)
+ (let (company-frontends
+ company-begin-commands
+ (company-backends
+ (list (lambda (command &optional _)
+ (cl-case command
+ (prefix (buffer-substring (point-min) (point)))
+ (candidates '("abc" "abd")))))))
+ (let ((company-continue-commands nil))
+ (let (this-command)
+ (company-complete))
+ (company-call 'backward-delete-char 1)
+ (should (null company-candidates-length)))
+ (let ((company-continue-commands '(backward-delete-char)))
+ (let (this-command)
+ (company-complete))
+ (company-call 'backward-delete-char 1)
+ (should (eq 2 company-candidates-length))))))
+
+(ert-deftest company-should-complete-blacklist ()
+ (with-temp-buffer
+ (insert "ab")
+ (company-mode)
+ (let (company-frontends
+ company-begin-commands
+ (company-backends
+ (list (lambda (command &optional _)
+ (cl-case command
+ (prefix (buffer-substring (point-min) (point)))
+ (candidates '("abc" "abd")))))))
+ (let ((company-continue-commands '(not backward-delete-char)))
+ (let (this-command)
+ (company-complete))
+ (company-call 'backward-delete-char 1)
+ (should (null company-candidates-length)))
+ (let ((company-continue-commands '(not backward-delete-char-untabify)))
+ (let (this-command)
+ (company-complete))
+ (company-call 'backward-delete-char 1)
+ (should (eq 2 company-candidates-length))))))
+
+(ert-deftest company-auto-complete-explicit ()
+ (with-temp-buffer
+ (insert "ab")
+ (company-mode)
+ (let (company-frontends
+ (company-auto-complete 'company-explicit-action-p)
+ (company-auto-complete-chars '(? ))
+ (company-backends
+ (list (lambda (command &optional _)
+ (cl-case command
+ (prefix (buffer-substring (point-min) (point)))
+ (candidates '("abcd" "abef")))))))
+ (let (this-command)
+ (company-complete))
+ (let ((last-command-event ? ))
+ (company-call 'self-insert-command 1))
+ (should (string= "abcd " (buffer-string))))))
+
+(ert-deftest company-no-auto-complete-when-idle ()
+ (with-temp-buffer
+ (insert "ab")
+ (company-mode)
+ (let (company-frontends
+ (company-auto-complete 'company-explicit-action-p)
+ (company-auto-complete-chars '(? ))
+ (company-minimum-prefix-length 2)
+ (company-backends
+ (list (lambda (command &optional _)
+ (cl-case command
+ (prefix (buffer-substring (point-min) (point)))
+ (candidates '("abcd" "abef")))))))
+ (company-idle-begin (current-buffer) (selected-window)
+ (buffer-chars-modified-tick) (point))
+ (let ((last-command-event ? ))
+ (company-call 'self-insert-command 1))
+ (should (string= "ab " (buffer-string))))))
+
+(ert-deftest company-clears-explicit-action-when-no-matches ()
+ (with-temp-buffer
+ (company-mode)
+ (let (company-frontends
+ company-backends)
+ (company-call 'manual-begin) ;; fails
+ (should (null company-candidates))
+ (should (null (company-explicit-action-p))))))
+
+(ert-deftest company-ignore-case-replaces-prefix ()
+ (with-temp-buffer
+ (company-mode)
+ (let (company-frontends
+ (company-backends
+ (list (lambda (command &optional _)
+ (cl-case command
+ (prefix (buffer-substring (point-min) (point)))
+ (candidates '("abcd" "abef"))
+ (ignore-case t))))))
+ (insert "A")
+ (let (this-command)
+ (company-complete))
+ (should (string= "ab" (buffer-string)))
+ (delete-char -2)
+ (insert "A") ; hack, to keep it in one test
+ (company-complete-selection)
+ (should (string= "abcd" (buffer-string))))))
+
+(ert-deftest company-ignore-case-with-keep-prefix ()
+ (with-temp-buffer
+ (insert "AB")
+ (company-mode)
+ (let (company-frontends
+ (company-backends
+ (list (lambda (command &optional _)
+ (cl-case command
+ (prefix (buffer-substring (point-min) (point)))
+ (candidates '("abcd" "abef"))
+ (ignore-case 'keep-prefix))))))
+ (let (this-command)
+ (company-complete))
+ (company-complete-selection)
+ (should (string= "ABcd" (buffer-string))))))
+
+(ert-deftest company-non-prefix-completion ()
+ (with-temp-buffer
+ (insert "tc")
+ (company-mode)
+ (let (company-frontends
+ (company-backends
+ (list (lambda (command &optional _)
+ (cl-case command
+ (prefix (buffer-substring (point-min) (point)))
+ (candidates '("tea-cup" "teal-color")))))))
+ (let (this-command)
+ (company-complete))
+ (should (string= "tc" (buffer-string)))
+ (company-complete-selection)
+ (should (string= "tea-cup" (buffer-string))))))
+
+;;; Row and column
+
+(ert-deftest company-column-with-composition ()
+ :tags '(interactive)
+ (with-temp-buffer
+ (save-window-excursion
+ (set-window-buffer nil (current-buffer))
+ (insert "lambda ()")
+ (compose-region 1 (1+ (length "lambda")) "\\")
+ (should (= (company--column) 4)))))
+
+(ert-deftest company-column-with-line-prefix ()
+ :tags '(interactive)
+ (with-temp-buffer
+ (save-window-excursion
+ (set-window-buffer nil (current-buffer))
+ (insert "foo")
+ (put-text-property (point-min) (point) 'line-prefix " ")
+ (should (= (company--column) 5)))))
+
+(ert-deftest company-column-with-line-prefix-on-empty-line ()
+ :tags '(interactive)
+ (with-temp-buffer
+ (save-window-excursion
+ (set-window-buffer nil (current-buffer))
+ (insert "\n")
+ (forward-char -1)
+ (put-text-property (point-min) (point-max) 'line-prefix " ")
+ (should (= (company--column) 2)))))
+
+(ert-deftest company-column-with-tabs ()
+ :tags '(interactive)
+ (with-temp-buffer
+ (save-window-excursion
+ (set-window-buffer nil (current-buffer))
+ (insert "|\t|\t|\t(")
+ (let ((tab-width 8))
+ (should (= (company--column) 25))))))
+
+(ert-deftest company-row-with-header-line-format ()
+ :tags '(interactive)
+ (with-temp-buffer
+ (save-window-excursion
+ (set-window-buffer nil (current-buffer))
+ (should (= (company--row) 0))
+ (setq header-line-format "aaaaaaa")
+ (should (= (company--row) 0)))))
diff --git a/company-elisp-tests.el b/test/elisp-tests.el
similarity index 97%
rename from company-elisp-tests.el
rename to test/elisp-tests.el
index 9b7cba3..7fd02de 100644
--- a/company-elisp-tests.el
+++ b/test/elisp-tests.el
@@ -1,6 +1,6 @@
-;;; company-elisp-tests.el --- company-elisp tests
+;;; elisp-tests.el --- company-elisp tests
-;; Copyright (C) 2013-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2015 Free Software Foundation, Inc.
;; Author: Dmitry Gutov
@@ -19,12 +19,9 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-;;
-
;;; Code:
+(require 'company-tests)
(require 'company-elisp)
(defmacro company-elisp-with-buffer (contents &rest body)
diff --git a/test/frontends-tests.el b/test/frontends-tests.el
new file mode 100644
index 0000000..1d12b3c
--- /dev/null
+++ b/test/frontends-tests.el
@@ -0,0 +1,289 @@
+;;; frontends-tests.el --- company-mode tests -*- lexical-binding: t -*-
+
+;; Copyright (C) 2015 Free Software Foundation, Inc.
+
+;; Author: Dmitry Gutov
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs 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.
+
+;; GNU Emacs 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 GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
+
+(require 'company-tests)
+
+(ert-deftest company-pseudo-tooltip-does-not-get-displaced ()
+ :tags '(interactive)
+ (with-temp-buffer
+ (save-window-excursion
+ (set-window-buffer nil (current-buffer))
+ (save-excursion (insert " ff"))
+ (company-mode)
+ (let ((company-frontends '(company-pseudo-tooltip-frontend))
+ (company-begin-commands '(self-insert-command))
+ (company-backends
+ (list (lambda (c &optional _)
+ (cl-case c (prefix "") (candidates '("a" "b" "c")))))))
+ (let (this-command)
+ (company-call 'complete))
+ (company-call 'open-line 1)
+ (should (eq 1 (overlay-start company-pseudo-tooltip-overlay)))))))
+
+(ert-deftest company-pseudo-tooltip-show ()
+ :tags '(interactive)
+ (with-temp-buffer
+ (save-window-excursion
+ (set-window-buffer nil (current-buffer))
+ (insert "aaaa\n bb\nccccccc\nddd")
+ (search-backward "bb")
+ (let ((col (company--column))
+ (company-candidates-length 2)
+ (company-candidates '("123" "45"))
+ (company-backend 'ignore))
+ (company-pseudo-tooltip-show (company--row) col 0)
+ (let ((ov company-pseudo-tooltip-overlay))
+ ;; With margins.
+ (should (eq (overlay-get ov 'company-width) 5))
+ ;; FIXME: Make it 2?
+ (should (eq (overlay-get ov 'company-height) company-tooltip-limit))
+ (should (eq (overlay-get ov 'company-column) col))
+ (should (string= (overlay-get ov 'company-display)
+ "\n 123 \nc 45 c\nddd\n")))))))
+
+(ert-deftest company-pseudo-tooltip-edit-updates-width ()
+ :tags '(interactive)
+ (with-temp-buffer
+ (set-window-buffer nil (current-buffer))
+ (let ((company-candidates-length 5)
+ (company-candidates '("123" "45" "67" "89" "1011"))
+ (company-backend 'ignore)
+ (company-tooltip-limit 4)
+ (company-tooltip-offset-display 'scrollbar))
+ (company-pseudo-tooltip-show (company--row)
+ (company--column)
+ 0)
+ (should (eq (overlay-get company-pseudo-tooltip-overlay 'company-width)
+ 6))
+ (company-pseudo-tooltip-edit 4)
+ (should (eq (overlay-get company-pseudo-tooltip-overlay 'company-width)
+ 7)))))
+
+(ert-deftest company-preview-show-with-annotations ()
+ :tags '(interactive)
+ (with-temp-buffer
+ (save-window-excursion
+ (set-window-buffer nil (current-buffer))
+ (save-excursion (insert "\n"))
+ (let ((company-candidates-length 1)
+ (company-candidates '("123")))
+ (company-preview-show-at-point (point))
+ (let* ((ov company-preview-overlay)
+ (str (overlay-get ov 'after-string)))
+ (should (string= str "123"))
+ (should (eq (get-text-property 0 'cursor str) 1)))))))
+
+(ert-deftest company-pseudo-tooltip-show-with-annotations ()
+ :tags '(interactive)
+ (with-temp-buffer
+ (save-window-excursion
+ (set-window-buffer nil (current-buffer))
+ (insert " ")
+ (save-excursion (insert "\n"))
+ (let ((company-candidates-length 2)
+ (company-backend (lambda (action &optional arg &rest _ignore)
+ (when (eq action 'annotation)
+ (cdr (assoc arg '(("123" . "(4)")))))))
+ (company-candidates '("123" "45"))
+ company-tooltip-align-annotations)
+ (company-pseudo-tooltip-show-at-point (point) 0)
+ (let ((ov company-pseudo-tooltip-overlay))
+ ;; With margins.
+ (should (eq (overlay-get ov 'company-width) 8))
+ (should (string= (overlay-get ov 'company-display)
+ "\n 123(4) \n 45 \n")))))))
+
+(ert-deftest company-pseudo-tooltip-show-with-annotations-right-aligned ()
+ :tags '(interactive)
+ (with-temp-buffer
+ (save-window-excursion
+ (set-window-buffer nil (current-buffer))
+ (insert " ")
+ (save-excursion (insert "\n"))
+ (let ((company-candidates-length 3)
+ (company-backend (lambda (action &optional arg &rest _ignore)
+ (when (eq action 'annotation)
+ (cdr (assoc arg '(("123" . "(4)")
+ ("67" . "(891011)")))))))
+ (company-candidates '("123" "45" "67"))
+ (company-tooltip-align-annotations t))
+ (company-pseudo-tooltip-show-at-point (point) 0)
+ (let ((ov company-pseudo-tooltip-overlay))
+ ;; With margins.
+ (should (eq (overlay-get ov 'company-width) 13))
+ (should (string= (overlay-get ov 'company-display)
+ "\n 123 (4) \n 45 \n 67 (891011)
\n")))))))
+
+(ert-deftest company-create-lines-shows-numbers ()
+ (let ((company-show-numbers t)
+ (company-candidates '("x" "y" "z"))
+ (company-candidates-length 3)
+ (company-backend 'ignore))
+ (should (equal '(" x 1 " " y 2 " " z 3 ")
+ (company--create-lines 0 999)))))
+
+(ert-deftest company-create-lines-truncates-annotations ()
+ (let* ((ww (company--window-width))
+ (data `(("1" . "(123)")
+ ("2" . nil)
+ ("3" . ,(concat "(" (make-string (- ww 2) ?4) ")"))
+ (,(make-string ww ?4) . "<4>")))
+ (company-candidates (mapcar #'car data))
+ (company-candidates-length 4)
+ (company-tooltip-margin 1)
+ (company-backend (lambda (cmd &optional arg)
+ (when (eq cmd 'annotation)
+ (cdr (assoc arg data)))))
+ company-tooltip-align-annotations)
+ (should (equal (list (format " 1(123)%s " (company-space-string (- ww 8)))
+ (format " 2%s " (company-space-string (- ww 3)))
+ (format " 3(444%s " (make-string (- ww 7) ?4))
+ (format " %s " (make-string (- ww 2) ?4)))
+ (company--create-lines 0 999)))
+ (let ((company-tooltip-align-annotations t))
+ (should (equal (list (format " 1%s(123) " (company-space-string (- ww
8)))
+ (format " 2%s " (company-space-string (- ww 3)))
+ (format " 3 (444%s " (make-string (- ww 8) ?4))
+ (format " %s " (make-string (- ww 2) ?4)))
+ (company--create-lines 0 999))))))
+
+(ert-deftest company-create-lines-truncates-common-part ()
+ (let* ((ww (company--window-width))
+ (company-candidates-length 2)
+ (company-tooltip-margin 1)
+ (company-backend #'ignore))
+ (let* ((company-common (make-string (- ww 3) ?1))
+ (company-candidates `(,(concat company-common "2")
+ ,(concat company-common "3"))))
+ (should (equal (list (format " %s2 " (make-string (- ww 3) ?1))
+ (format " %s3 " (make-string (- ww 3) ?1)))
+ (company--create-lines 0 999))))
+ (let* ((company-common (make-string (- ww 2) ?1))
+ (company-candidates `(,(concat company-common "2")
+ ,(concat company-common "3"))))
+ (should (equal (list (format " %s " company-common)
+ (format " %s " company-common))
+ (company--create-lines 0 999))))
+ (let* ((company-common (make-string ww ?1))
+ (company-candidates `(,(concat company-common "2")
+ ,(concat company-common "3")))
+ (res (company--create-lines 0 999)))
+ (should (equal (list (format " %s " (make-string (- ww 2) ?1))
+ (format " %s " (make-string (- ww 2) ?1)))
+ res))
+ (should (eq 'company-tooltip-common-selection
+ (get-text-property (- ww 2) 'face
+ (car res))))
+ (should (eq 'company-tooltip-selection
+ (get-text-property (1- ww) 'face
+ (car res))))
+ )))
+
+(ert-deftest company-create-lines-clears-out-non-printables ()
+ :tags '(interactive)
+ (let (company-show-numbers
+ (company-candidates (list
+ (decode-coding-string "avalis\351e" 'utf-8)
+ "avatar"))
+ (company-candidates-length 2)
+ (company-backend 'ignore))
+ (should (equal '(" avalis‗e "
+ " avatar ")
+ (company--create-lines 0 999)))))
+
+(ert-deftest company-create-lines-handles-multiple-width ()
+ :tags '(interactive)
+ (let (company-show-numbers
+ (company-candidates '("蛙蛙蛙蛙" "蛙abc"))
+ (company-candidates-length 2)
+ (company-backend 'ignore))
+ (should (equal '(" 蛙蛙蛙蛙 "
+ " 蛙abc ")
+ (company--create-lines 0 999)))))
+
+(ert-deftest company-create-lines-handles-multiple-width-in-annotation ()
+ (let* (company-show-numbers
+ (alist '(("a" . " ︸") ("b" . " ︸︸")))
+ (company-candidates (mapcar #'car alist))
+ (company-candidates-length 2)
+ (company-backend (lambda (c &optional a)
+ (when (eq c 'annotation)
+ (assoc-default a alist)))))
+ (should (equal '(" a ︸ "
+ " b ︸︸ ")
+ (company--create-lines 0 999)))))
+
+(ert-deftest company-column-with-composition ()
+ :tags '(interactive)
+ (with-temp-buffer
+ (save-window-excursion
+ (set-window-buffer nil (current-buffer))
+ (insert "lambda ()")
+ (compose-region 1 (1+ (length "lambda")) "\\")
+ (should (= (company--column) 4)))))
+
+(ert-deftest company-plainify ()
+ (let ((tab-width 8))
+ (should (equal-including-properties
+ (company-plainify "\tabc\td\t")
+ (concat " "
+ "abc "
+ "d "))))
+ (should (equal-including-properties
+ (company-plainify (propertize "foobar" 'line-prefix "-*-"))
+ "-*-foobar")))
+
+(ert-deftest company-buffer-lines-with-lines-folded ()
+ :tags '(interactive)
+ (with-temp-buffer
+ (insert (propertize "aaa\nbbb\nccc\nddd\n" 'display "aaa+\n"))
+ (insert "eee\nfff\nggg")
+ (should (equal (company-buffer-lines (point-min) (point-max))
+ '("aaa" "eee" "fff" "ggg")))))
+
+(ert-deftest company-buffer-lines-with-multiline-display ()
+ :tags '(interactive)
+ (with-temp-buffer
+ (insert (propertize "a" 'display "bbb\nccc\ndddd\n"))
+ (insert "eee\nfff\nggg")
+ (should (equal (company-buffer-lines (point-min) (point-max))
+ '("" "" "" "eee" "fff" "ggg")))))
+
+(ert-deftest company-modify-line ()
+ (let ((str "-*-foobar"))
+ (should (equal-including-properties
+ (company-modify-line str "zz" 4)
+ "-*-fzzbar"))
+ (should (equal-including-properties
+ (company-modify-line str "xx" 0)
+ "xx-foobar"))
+ (should (equal-including-properties
+ (company-modify-line str "zz" 10)
+ "-*-foobar zz"))))
+
+(ert-deftest company-scrollbar-bounds ()
+ (should (equal nil (company--scrollbar-bounds 0 3 3)))
+ (should (equal nil (company--scrollbar-bounds 0 4 3)))
+ (should (equal '(0 . 0) (company--scrollbar-bounds 0 1 2)))
+ (should (equal '(1 . 1) (company--scrollbar-bounds 2 2 4)))
+ (should (equal '(2 . 3) (company--scrollbar-bounds 7 4 12)))
+ (should (equal '(1 . 2) (company--scrollbar-bounds 3 4 12)))
+ (should (equal '(1 . 3) (company--scrollbar-bounds 4 5 11))))
diff --git a/test/keywords-tests.el b/test/keywords-tests.el
new file mode 100644
index 0000000..05843b2
--- /dev/null
+++ b/test/keywords-tests.el
@@ -0,0 +1,32 @@
+;;; keywords-tests.el --- company-keywords tests -*- lexical-binding: t -*-
+
+;; Copyright (C) 2011, 2013-2015 Free Software Foundation, Inc.
+
+;; Author: Nikolaj Schumacher
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs 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.
+
+;; GNU Emacs 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 GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
+
+(require 'company-keywords)
+
+(ert-deftest company-sorted-keywords ()
+ "Test that keywords in `company-keywords-alist' are in alphabetical order."
+ (dolist (pair company-keywords-alist)
+ (when (consp (cdr pair))
+ (let ((prev (cadr pair)))
+ (dolist (next (cddr pair))
+ (should (not (equal prev next)))
+ (should (string< prev next))
+ (setq prev next))))))
diff --git a/test/template-tests.el b/test/template-tests.el
new file mode 100644
index 0000000..09548c4
--- /dev/null
+++ b/test/template-tests.el
@@ -0,0 +1,91 @@
+;;; template-tests.el --- company-mode tests -*- lexical-binding: t -*-
+
+;; Copyright (C) 2015 Free Software Foundation, Inc.
+
+;; Author: Dmitry Gutov
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs 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.
+
+;; GNU Emacs 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 GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
+
+(require 'company-tests)
+(require 'company-template)
+
+(ert-deftest company-template-removed-after-the-last-jump ()
+ (with-temp-buffer
+ (insert "{ }")
+ (goto-char 2)
+ (let ((tpl (company-template-declare-template (point) (1- (point-max)))))
+ (save-excursion
+ (dotimes (_ 2)
+ (insert " ")
+ (company-template-add-field tpl (point) "foo")))
+ (company-call 'template-forward-field)
+ (should (= 3 (point)))
+ (company-call 'template-forward-field)
+ (should (= 7 (point)))
+ (company-call 'template-forward-field)
+ (should (= 11 (point)))
+ (should (zerop (length (overlay-get tpl 'company-template-fields))))
+ (should (null (overlay-buffer tpl))))))
+
+(ert-deftest company-template-removed-after-input-and-jump ()
+ (with-temp-buffer
+ (insert "{ }")
+ (goto-char 2)
+ (let ((tpl (company-template-declare-template (point) (1- (point-max)))))
+ (save-excursion
+ (insert " ")
+ (company-template-add-field tpl (point) "bar"))
+ (company-call 'template-move-to-first tpl)
+ (should (= 3 (point)))
+ (dolist (c (string-to-list "tee"))
+ (let ((last-command-event c))
+ (company-call 'self-insert-command 1)))
+ (should (string= "{ tee }" (buffer-string)))
+ (should (overlay-buffer tpl))
+ (company-call 'template-forward-field)
+ (should (= 7 (point)))
+ (should (null (overlay-buffer tpl))))))
+
+(ert-deftest company-template-c-like-templatify ()
+ (with-temp-buffer
+ (let ((text "foo(int a, short b)"))
+ (insert text)
+ (company-template-c-like-templatify text)
+ (should (equal "foo(arg0, arg1)" (buffer-string)))
+ (should (looking-at "arg0"))
+ (should (equal "int a"
+ (overlay-get (company-template-field-at) 'display))))))
+
+(ert-deftest company-template-c-like-templatify-trims-after-closing-paren ()
+ (with-temp-buffer
+ (let ((text "foo(int a, short b)!@ #1334 a"))
+ (insert text)
+ (company-template-c-like-templatify text)
+ (should (equal "foo(arg0, arg1)" (buffer-string)))
+ (should (looking-at "arg0")))))
+
+(ert-deftest company-template-c-like-templatify-generics ()
+ (with-temp-buffer
+ (let ((text "foo<TKey, TValue>(int i, Dict<TKey, TValue>, long l)"))
+ (insert text)
+ (company-template-c-like-templatify text)
+ (should (equal "foo<arg0, arg1>(arg2, arg3, arg4)" (buffer-string)))
+ (should (looking-at "arg0"))
+ (should (equal "TKey" (overlay-get (company-template-field-at)
'display)))
+ (search-forward "arg3")
+ (forward-char -1)
+ (should (equal "Dict<TKey, TValue>"
+ (overlay-get (company-template-field-at) 'display))))))
diff --git a/test/transformers-tests.el b/test/transformers-tests.el
new file mode 100644
index 0000000..4d027e5
--- /dev/null
+++ b/test/transformers-tests.el
@@ -0,0 +1,58 @@
+;;; transformers-tests.el --- company-mode tests -*- lexical-binding: t -*-
+
+;; Copyright (C) 2015 Free Software Foundation, Inc.
+
+;; Author: Dmitry Gutov
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs 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.
+
+;; GNU Emacs 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 GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
+
+(require 'company-tests)
+
+(ert-deftest company-occurrence-prefer-closest-above ()
+ (with-temp-buffer
+ (save-window-excursion
+ (set-window-buffer nil (current-buffer))
+ (insert "foo0
+foo1
+")
+ (save-excursion
+ (insert "
+foo3
+foo2"))
+ (let ((company-backend 'company-dabbrev)
+ (company-occurrence-weight-function
+ 'company-occurrence-prefer-closest-above))
+ (should (equal '("foo1" "foo0" "foo3" "foo2" "foo4")
+ (company-sort-by-occurrence
+ '("foo0" "foo1" "foo2" "foo3" "foo4"))))))))
+
+(ert-deftest company-occurrence-prefer-any-closest ()
+ (with-temp-buffer
+ (save-window-excursion
+ (set-window-buffer nil (current-buffer))
+ (insert "foo0
+foo1
+")
+ (save-excursion
+ (insert "
+foo3
+foo2"))
+ (let ((company-backend 'company-dabbrev)
+ (company-occurrence-weight-function
+ 'company-occurrence-prefer-any-closest))
+ (should (equal '("foo1" "foo3" "foo0" "foo2" "foo4")
+ (company-sort-by-occurrence
+ '("foo0" "foo1" "foo2" "foo3" "foo4"))))))))
- [elpa] master 9c99c7c 60/66: company-search-abort: Move predicate reset to the mode function, (continued)
- [elpa] master 9c99c7c 60/66: company-search-abort: Move predicate reset to the mode function, Dmitry Gutov, 2015/01/12
- [elpa] master 31d352f 53/66: Update NEWS.md, Dmitry Gutov, 2015/01/12
- [elpa] master 559b4f2 49/66: Don't repeat search with empty string, Dmitry Gutov, 2015/01/12
- [elpa] master 388545b 54/66: Add company-complete-common-or-cycle, Dmitry Gutov, 2015/01/12
- [elpa] master 160ab01 63/66: Split company--process-candidates into -pre and -post, Dmitry Gutov, 2015/01/12
- [elpa] master 8f09f52 61/66: Replace `cl-plusp' usages with `string=', Dmitry Gutov, 2015/01/12
- [elpa] master 5b0f1c8 62/66: company-search-delete-char: Use `ding', Dmitry Gutov, 2015/01/12
- [elpa] master 5ebcae8 64/66: Improve duplicates removal, Dmitry Gutov, 2015/01/12
- [elpa] master 770d0d8 59/66: Work around http://debbugs.gnu.org/19553, Dmitry Gutov, 2015/01/12
- [elpa] master eb0d8d9 65/66: Release 0.8.8, Dmitry Gutov, 2015/01/12
- [elpa] master a95c2ce 42/66: Reorganize tests layout,
Dmitry Gutov <=
- [elpa] master 092486e 66/66: Merge commit 'eb0d8d9e687e1364098f9abc6f9281fcbc0d3abd' from company, Dmitry Gutov, 2015/01/12