[elpa] 14/16: Fix tests in batch mode

[Dmitry Gutov]

dgutov pushed a commit to branch master
in repository elpa.

commit 63f3b79b172f10f6c7c0cf54209b4382ba6c3e5d
Author: Dmitry Gutov <address@hidden>
Date:   Mon Jul 21 16:38:45 2014 +0300

    Fix tests in batch mode
---
 company-tests.el |   40 ++++++++++++++++++++++------------------
 1 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/company-tests.el b/company-tests.el
index fc7aec1..005bf3a 100644
--- a/company-tests.el
+++ b/company-tests.el
@@ -718,35 +718,39 @@
 
 (ert-deftest company-occurrence-prefer-closest-above ()
   (with-temp-buffer
-    (insert "foo0
+    (save-window-excursion
+      (set-window-buffer nil (current-buffer))
+      (insert "foo0
 foo1
 ")
-    (save-excursion
-      (insert "
+      (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")))))))
+      (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
-    (insert "foo0
+    (save-window-excursion
+      (set-window-buffer nil (current-buffer))
+      (insert "foo0
 foo1
 ")
-    (save-excursion
-      (insert "
+      (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")))))))
+      (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