X-Git-Url: https://code.delx.au/gnu-emacs-elpa/blobdiff_plain/35e38bb102b04fa59f64e9bfe7b693d2082d748a..777982049314af306a020b7de2ca6cb00b428822:/company-tests.el

diff --git a/company-tests.el b/company-tests.el
index 5d08c94c8..f0d669d11 100644
--- a/company-tests.el
+++ b/company-tests.el
@@ -1,8 +1,8 @@
-;;; company-tests.el --- company-mode tests
+;;; company-tests.el --- company-mode test helpers  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2011, 2013  Free Software Foundation, Inc.
+;; Copyright (C) 2011, 2013-2014  Free Software Foundation, Inc.
 
-;; Author: Nikolaj Schumacher
+;; Author: Dmitry Gutov
 
 ;; This file is part of GNU Emacs.
 
@@ -19,192 +19,18 @@
 ;; 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)
-
-(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--explicit-action)
-    (should (eq t (company--good-prefix-p "!@#$%")))
-    (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))))))
-
-(ert-deftest company-multi-backend-with-lambdas ()
-  (let ((company-backend
-         (list (lambda (command &optional arg &rest ignore)
-                 (case command
-                   (prefix "z")
-                   (candidates '("a" "b"))))
-               (lambda (command &optional arg &rest ignore)
-                 (case command
-                   (prefix "z")
-                   (candidates '("c" "d")))))))
-    (should (equal (company-call-backend 'candidates "z") '("a" "b" "c" "d")))))
-
-(ert-deftest company-begin-backend-failure-doesnt-break-company-backends ()
-  (with-temp-buffer
-    (insert "a")
-    (company-mode)
-    (should-error
-     (company-begin-backend (lambda (command &rest ignore))))
-    (let (company-frontends
-          (company-backends
-           (list (lambda (command &optional arg)
-                   (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 arg)
-                   (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-require-match 'company-explicit-action-p)
-          (company-backends
-           (list (lambda (command &optional arg)
-                   (case command
-                     (prefix (buffer-substring (point-min) (point)))
-                     (candidates '("abc" "abd")))))))
-      (company-idle-begin (current-buffer) (selected-window)
-                          (buffer-chars-modified-tick) (point))
-      (let ((last-command-event ?e))
-        (company-call 'self-insert-command 1))
-      (should (eq nil company-candidates-length))
-      (should (eq 4 (point))))))
-
-(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 arg)
-                   (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-backends
-           (list (lambda (command &optional arg)
-                   (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-pseudo-tooltip-does-not-get-displaced ()
-  (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 arg)
-                     (case c (prefix "") (candidates '("a" "b" "c")))))))
-        (let (this-command)
-          (company-call 'complete))
-        (company-call 'open-line 1)
-        (should (eq 2 (overlay-start company-pseudo-tooltip-overlay)))))))
-
-(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 (i 2)
-          (insert " ")
-          (company-template-add-field tpl (point) "foo")
-          (forward-char 3)))
-      (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--column (&optional pos)
+  (car (company--col-row pos)))
 
 (defun company-call (name &rest args)
   (let* ((maybe (intern (format "company-%s" name)))
          (command (if (fboundp maybe) maybe name)))
+    (let ((this-command command))
+      (run-hooks 'pre-command-hook))
     (apply command args)
     (let ((this-command command))
       (run-hooks 'post-command-hook))))
+
+(provide 'company-tests)