Merge branch 'master' of github.com:leoliu/ggtags

[gnu-emacs-elpa] / packages / company / company-tests.el

diff --git a/packages/company/company-tests.el b/packages/company/company-tests.el
index 9f837cbae99a1aa52ea21006273582acf494cec4..870ad2b1022deaf9bc594c2c7aa9cb21e2db9685 100644 (file)
--- a/packages/company/company-tests.el
+++ b/packages/company/company-tests.el
@@ -195,7 +195,7 @@
         ;; 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-before)
+        (should (string= (overlay-get ov 'company-after)
                          " 123\nc45 c\nddd\n")))))))
 
 (ert-deftest company-column-with-composition ()
@@ -210,14 +210,29 @@
     (put-text-property (point-min) (point) 'line-prefix "  ")
     (should (= (company--column) 5))))
 
-(ert-deftest company-modify-line-with-line-prefix ()
-  (let ((str (propertize "foobar" 'line-prefix "-*-")))
+(ert-deftest company-column-wth-line-prefix-on-empty-line ()
+  (with-temp-buffer
+    (insert "\n")
+    (forward-char -1)
+    (put-text-property (point-min) (point-max) 'line-prefix "  ")
+    (should (= (company--column) 2))))
+
+(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-modify-line ()
+  (let ((str "-*-foobar"))
     (should (equal-including-properties
              (company-modify-line str "zz" 4)
              "-*-fzzbar"))
-    (should (equal-including-properties
-             (company-modify-line str "zzxx" 1)
-             "-zzxxobar"))
     (should (equal-including-properties
              (company-modify-line str "xx" 0)
              "xx-foobar"))
@@ -281,6 +296,14 @@
       (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")))))
+
 ;;; Elisp
 
 (defmacro company-elisp-with-buffer (contents &rest body)